Updating ABI for GraphicBufferAllocator overflow fix

Bug: 142767215
Test: build, boot, GraphicBufferAllocator_test
Change-Id: I5cc0ef3b9a6173ed2e08d67483ceb762ddb06a0a
diff --git a/29/32/arm_armv7-a-neon/source-based/libui.so.lsdump b/29/32/arm_armv7-a-neon/source-based/libui.so.lsdump
index 20c7f22..517f12f 100644
--- a/29/32/arm_armv7-a-neon/source-based/libui.so.lsdump
+++ b/29/32/arm_armv7-a-neon/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2279",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -178,8 +169,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -188,16 +179,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -213,8 +204,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -222,16 +213,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -239,8 +230,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -267,8 +258,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -277,8 +268,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -297,8 +288,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -314,8 +305,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1661,12 +1652,18 @@
    "name" : "__aeabi_memset8"
   },
   {
+   "name" : "__aeabi_uidiv"
+  },
+  {
    "name" : "__aeabi_uidivmod"
   },
   {
    "name" : "__udivmodsi4"
   },
   {
+   "name" : "__udivsi3"
+  },
+  {
    "name" : "android_convertGralloc0To1Usage"
   },
   {
@@ -1848,11 +1845,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -2014,11 +2011,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -2036,11 +2033,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2066,7 +2063,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2088,11 +2085,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2115,11 +2112,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2145,11 +2142,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2167,11 +2164,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2185,11 +2182,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2203,11 +2200,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2225,7 +2222,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2239,11 +2236,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2257,11 +2254,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2275,11 +2272,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2297,7 +2294,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2315,7 +2312,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2333,7 +2330,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2351,7 +2348,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2365,11 +2362,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2383,11 +2380,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2401,11 +2398,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2420,11 +2417,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2450,7 +2447,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2472,7 +2469,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2494,11 +2491,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2552,7 +2549,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2606,7 +2603,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2708,11 +2705,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2766,7 +2763,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2808,7 +2805,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3050,7 +3047,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3076,7 +3073,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3170,7 +3167,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3204,7 +3201,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3314,11 +3311,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3384,7 +3381,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3642,7 +3639,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3764,7 +3761,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3794,7 +3791,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3908,11 +3905,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3982,7 +3979,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4256,7 +4253,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4286,7 +4283,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4412,7 +4409,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4434,11 +4431,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "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-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4476,11 +4473,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4510,11 +4507,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4564,7 +4561,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4618,7 +4615,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4644,7 +4641,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4686,7 +4683,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4928,7 +4925,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4958,7 +4955,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4988,7 +4985,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -5030,7 +5027,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5068,7 +5065,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5094,7 +5091,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5112,7 +5109,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5142,7 +5139,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5236,7 +5233,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5278,7 +5275,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5296,7 +5293,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5326,7 +5323,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5360,7 +5357,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5414,7 +5411,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5427,18 +5424,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5451,11 +5448,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5469,26 +5466,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5499,15 +5496,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5517,18 +5514,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5538,33 +5535,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5574,36 +5571,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5613,33 +5610,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5649,36 +5646,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5688,15 +5742,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5706,18 +5760,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5727,12 +5781,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5742,15 +5796,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5760,15 +5814,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5778,24 +5832,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5805,12 +5859,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5820,12 +5874,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5838,14 +5892,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5856,27 +5910,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5886,12 +5940,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5901,18 +5955,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5927,7 +5981,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5939,7 +5993,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5951,7 +6005,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5963,7 +6017,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5975,7 +6029,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5984,10 +6038,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5999,7 +6053,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6011,7 +6065,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6023,7 +6077,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6110,7 +6164,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6119,7 +6173,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6129,10 +6183,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6141,14 +6195,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6158,10 +6212,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6171,18 +6225,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6192,10 +6246,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6208,10 +6262,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6221,23 +6275,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6247,28 +6301,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6278,23 +6332,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6304,10 +6358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6316,14 +6370,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6333,10 +6387,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6346,18 +6400,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6367,10 +6421,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6383,10 +6437,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6396,23 +6450,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6422,28 +6476,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6453,23 +6507,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6479,16 +6533,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6497,10 +6551,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6510,10 +6564,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6523,13 +6577,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6539,25 +6593,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6568,10 +6622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6581,13 +6635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6598,28 +6652,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6630,34 +6684,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6667,19 +6721,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6689,22 +6743,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6714,16 +6768,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6733,22 +6787,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6761,10 +6815,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,10 +6827,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6788,13 +6842,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6806,7 +6860,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6816,24 +6870,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6897,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,10 +6927,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6886,27 +6940,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6916,30 +6970,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6949,33 +7003,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6985,16 +7039,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7004,19 +7058,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7026,7 +7080,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -7041,7 +7095,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7051,34 +7105,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7088,26 +7142,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7117,25 +7171,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7144,7 +7198,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7154,29 +7208,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7186,10 +7240,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7199,34 +7253,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7236,26 +7290,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7265,25 +7319,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7292,7 +7346,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7302,29 +7356,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7334,10 +7388,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7348,10 +7402,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7362,10 +7416,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7376,10 +7430,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7388,16 +7442,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7407,10 +7461,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7420,10 +7474,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7439,10 +7493,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7458,7 +7512,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7474,7 +7528,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7487,7 +7541,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7500,7 +7554,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7526,13 +7580,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7542,13 +7596,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7567,7 +7621,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7586,7 +7640,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7596,16 +7650,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7616,10 +7670,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7629,13 +7683,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7645,19 +7699,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7667,28 +7721,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7698,16 +7752,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7717,34 +7771,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7754,25 +7808,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7782,19 +7836,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7804,30 +7858,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7837,13 +7891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7853,33 +7907,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7889,36 +7943,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7928,22 +7982,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7954,10 +8008,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7968,10 +8022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7980,16 +8034,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2300"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7999,13 +8053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8015,93 +8069,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8114,7 +8168,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8127,7 +8181,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8137,7 +8191,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8146,7 +8200,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8156,7 +8210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8171,7 +8225,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8181,10 +8235,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8193,7 +8247,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8203,10 +8257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8242,13 +8296,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8258,13 +8312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8274,10 +8328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8287,13 +8341,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8303,13 +8357,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8319,10 +8373,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8332,10 +8386,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8345,10 +8399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8358,13 +8412,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2292",
+   "return_type" : "type-2294",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8377,7 +8431,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8390,16 +8444,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8415,10 +8469,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8434,10 +8488,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8453,10 +8507,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8469,10 +8523,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8481,7 +8535,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8499,7 +8553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8533,7 +8587,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8549,7 +8603,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8562,10 +8616,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8581,7 +8635,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8594,10 +8648,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8607,13 +8661,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8623,13 +8677,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,19 +8693,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8716,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8682,22 +8736,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8708,16 +8762,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8727,16 +8781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8746,10 +8800,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8759,22 +8813,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8784,19 +8838,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8806,25 +8860,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8834,19 +8888,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8856,25 +8910,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8883,10 +8937,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8896,13 +8950,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8912,16 +8966,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8931,16 +8985,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8950,10 +9004,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8963,13 +9017,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8979,13 +9033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8995,19 +9049,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9017,13 +9071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9033,13 +9087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9049,19 +9103,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9071,13 +9125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9087,13 +9141,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9103,19 +9157,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9125,10 +9179,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9145,7 +9199,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-10"
@@ -9154,7 +9208,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9164,19 +9218,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9186,16 +9240,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9205,16 +9259,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9224,13 +9278,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9240,13 +9294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9256,10 +9310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9269,13 +9323,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9285,13 +9339,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9301,10 +9355,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9314,10 +9368,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9327,10 +9381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9340,13 +9394,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9356,10 +9410,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9369,13 +9423,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9385,13 +9439,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9401,7 +9455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9416,7 +9470,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9426,13 +9480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9442,13 +9496,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9458,13 +9512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9474,13 +9528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9490,13 +9544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9506,13 +9560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9523,7 +9577,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9532,7 +9586,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9542,13 +9596,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9558,13 +9612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9574,13 +9628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9591,7 +9645,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9600,7 +9654,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9610,25 +9664,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9638,7 +9692,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9651,10 +9705,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9664,16 +9718,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9693,7 +9747,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9707,13 +9761,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,13 +9781,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9747,16 +9801,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9770,16 +9824,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9793,16 +9847,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9816,16 +9870,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9835,10 +9889,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9848,28 +9902,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9879,7 +9933,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9892,10 +9946,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9905,7 +9959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9918,7 +9972,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9933,7 +9987,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9943,10 +9997,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9956,13 +10010,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9972,28 +10026,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10003,16 +10057,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10022,16 +10076,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10041,19 +10095,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10063,31 +10117,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10098,13 +10152,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10114,25 +10168,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10142,31 +10196,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10176,13 +10230,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10192,7 +10246,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10205,10 +10259,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10218,16 +10272,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10237,10 +10291,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10250,34 +10304,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10287,7 +10341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10300,10 +10354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10313,13 +10367,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10329,13 +10383,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10348,7 +10402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-6",
@@ -10361,10 +10415,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10374,7 +10428,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10387,7 +10441,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10400,7 +10454,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10413,7 +10467,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10426,13 +10480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,16 +10496,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
-    },
-    {
      "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2295"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10462,10 +10516,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10475,10 +10529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10488,10 +10542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10501,10 +10555,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2276",
+   "return_type" : "type-2278",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10514,7 +10568,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1246"
@@ -10534,13 +10588,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10550,13 +10604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10566,13 +10620,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10582,7 +10636,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1280"
@@ -10598,16 +10652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10617,10 +10671,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10633,13 +10687,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10687,13 +10741,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10757,7 +10811,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10770,7 +10824,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10783,7 +10837,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10796,7 +10850,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10821,7 +10875,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10831,13 +10885,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10847,13 +10901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10863,19 +10917,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10885,10 +10939,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10898,10 +10952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
    "return_type" : "type-6",
@@ -10914,7 +10968,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10927,17 +10981,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10947,20 +11001,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2228"
+     "referenced_type" : "type-2231"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10970,7 +11024,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10983,13 +11037,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10999,13 +11053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11015,19 +11069,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11037,16 +11091,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11056,7 +11110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1284"
@@ -11072,13 +11126,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11091,10 +11145,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11107,13 +11161,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11123,13 +11177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11139,19 +11193,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11161,13 +11215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,13 +11231,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,19 +11247,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11216,16 +11270,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11236,22 +11290,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11262,16 +11316,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11281,16 +11335,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11301,16 +11355,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,16 +11375,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11341,19 +11395,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11364,19 +11418,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11387,19 +11441,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11410,19 +11464,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11432,10 +11486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11445,10 +11499,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11458,7 +11512,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11471,10 +11525,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11484,10 +11538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11497,7 +11551,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11512,24 +11566,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11565,41 +11619,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2220",
+   "referenced_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11609,8 +11663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11618,8 +11672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11627,8 +11681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11636,8 +11690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11654,8 +11708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11672,8 +11726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11690,8 +11744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11699,8 +11753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11708,8 +11762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11717,8 +11771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11735,8 +11789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11744,8 +11798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11753,8 +11807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11771,7 +11825,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11780,7 +11834,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11789,7 +11843,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11798,7 +11852,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11807,8 +11861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11816,8 +11870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11825,8 +11879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11834,8 +11888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11843,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11861,7 +11915,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11870,8 +11924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11879,8 +11933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11888,8 +11942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11897,8 +11951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11906,8 +11960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2841",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11915,8 +11969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2917",
-   "self_type" : "type-2916",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2919",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11924,8 +11978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11933,8 +11987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11951,8 +12005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11970,7 +12024,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11978,8 +12032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11987,8 +12041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11996,8 +12050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12005,8 +12059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12014,8 +12068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12023,8 +12077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12047,78 +12101,78 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2204",
+   "referenced_type" : "type-2206",
    "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2254",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2742",
+   "self_type" : "type-2744",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
    "referenced_type" : "type-3102",
-   "self_type" : "type-3134",
+   "self_type" : "type-3137",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-3368",
-   "self_type" : "type-3370",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2139",
+   "referenced_type" : "type-2138",
    "self_type" : "type-2149",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2733",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2735",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3024",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3383",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12134,7 +12188,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12143,8 +12197,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12152,8 +12206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12170,8 +12224,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12179,8 +12233,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12188,8 +12242,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12197,8 +12251,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12206,17 +12260,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3028",
-   "self_type" : "type-3027",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3030",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12233,6 +12278,15 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GrallocMapper &",
+   "name" : "const android::GrallocMapper &",
    "referenced_type" : "type-612",
    "self_type" : "type-611",
    "size" : 4,
@@ -12242,8 +12296,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12251,8 +12305,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12261,7 +12315,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12269,8 +12323,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12296,8 +12350,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12305,8 +12359,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12314,8 +12368,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12323,8 +12377,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12332,8 +12386,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12341,8 +12395,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12350,8 +12404,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12359,8 +12413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12413,8 +12467,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12422,8 +12476,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12431,8 +12485,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12494,8 +12548,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12513,7 +12567,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12530,8 +12584,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12539,8 +12593,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12566,8 +12620,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12575,7 +12629,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12584,7 +12638,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12593,7 +12647,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12608,44 +12662,44 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2266",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3178",
-   "self_type" : "type-3190",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3191",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3373",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3376",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12668,169 +12722,169 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2096",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2098",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2552",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2588",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2759",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2816",
-   "self_type" : "type-2818",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2837",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2839",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2907",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3053",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3146",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3216",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3221",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3258",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-3261",
+   "self_type" : "type-3263",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3312",
+   "self_type" : "type-3314",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3419",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12843,15 +12897,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12890,8 +12944,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12899,8 +12953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12909,7 +12963,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12926,8 +12980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12935,8 +12989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2737",
-   "self_type" : "type-2739",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12944,8 +12998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12953,8 +13007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12962,8 +13016,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-2182",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12971,8 +13025,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-2734",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2736",
+   "self_type" : "type-2738",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12980,8 +13034,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-3072",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12998,8 +13052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13007,8 +13061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2746",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2748",
+   "self_type" : "type-2750",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13016,7 +13070,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3191",
+   "referenced_type" : "type-3194",
    "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -13025,8 +13079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13034,8 +13088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2513",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13043,8 +13097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2810",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13052,8 +13106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13061,8 +13115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13070,8 +13124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3301",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13088,8 +13142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13106,8 +13160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13115,8 +13169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13124,8 +13178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13133,8 +13187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13142,8 +13196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13151,8 +13205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2022",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13160,8 +13214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13169,8 +13223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13178,8 +13232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13187,8 +13241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13196,8 +13250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13205,8 +13259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2796",
+   "self_type" : "type-2795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13214,8 +13268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13223,8 +13277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2873",
+   "self_type" : "type-2872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13232,8 +13286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2963",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13241,8 +13295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3042",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13250,8 +13304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3118",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13259,8 +13313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13268,8 +13322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13277,8 +13331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3296",
-   "self_type" : "type-3295",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13286,8 +13340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3346",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13295,8 +13349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3512",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13304,8 +13358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13313,8 +13367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13331,8 +13385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13340,8 +13394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13349,8 +13403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13358,8 +13412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13367,8 +13421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13376,7 +13430,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13386,7 +13440,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13412,7 +13466,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13421,7 +13475,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13430,8 +13484,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13439,8 +13493,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13448,8 +13502,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13457,8 +13511,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2721",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13466,8 +13520,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13475,8 +13529,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13484,8 +13538,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13493,8 +13547,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-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13502,8 +13556,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-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13511,8 +13565,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-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13520,8 +13574,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-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13529,8 +13583,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-3116",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13538,8 +13592,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-3360",
-   "self_type" : "type-3359",
+   "referenced_type" : "type-3363",
+   "self_type" : "type-3362",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13547,8 +13601,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13556,8 +13610,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-3397",
-   "self_type" : "type-3396",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13574,7 +13628,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13583,7 +13637,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13592,7 +13646,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13604,8 +13658,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13613,8 +13667,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3034",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13622,8 +13676,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13631,7 +13685,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13658,8 +13712,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13667,8 +13721,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13676,8 +13730,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13685,8 +13739,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13694,8 +13748,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13703,8 +13757,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13721,8 +13775,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13730,8 +13784,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13739,8 +13793,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13748,8 +13802,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2797",
-   "self_type" : "type-2796",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13757,8 +13811,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2812",
-   "self_type" : "type-2811",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13766,8 +13820,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3571",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13775,8 +13829,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3626",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13793,8 +13847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13803,7 +13857,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13820,8 +13874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13838,8 +13892,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13847,8 +13901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13856,8 +13910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13865,8 +13919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13883,8 +13937,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13892,8 +13946,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13901,8 +13955,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13910,8 +13964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13919,8 +13973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13928,8 +13982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13946,8 +14000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13955,8 +14009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13964,8 +14018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13973,8 +14027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2842",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13982,8 +14036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13991,8 +14045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2921",
-   "self_type" : "type-2920",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14000,8 +14054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14009,8 +14063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14019,7 +14073,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2233",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14036,8 +14090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14045,8 +14099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14063,8 +14117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14072,8 +14126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14081,8 +14135,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14099,8 +14153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14108,8 +14162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14135,8 +14189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14144,8 +14198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14153,8 +14207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14162,8 +14216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14171,8 +14225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14180,8 +14234,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14189,8 +14243,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14198,8 +14252,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14207,8 +14261,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14216,8 +14270,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14225,8 +14279,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14234,8 +14288,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14243,8 +14297,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14252,8 +14306,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14261,8 +14315,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14270,8 +14324,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14279,8 +14333,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-2801",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14288,8 +14342,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14297,8 +14351,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2813",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14306,8 +14360,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2833",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14315,8 +14369,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2899",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14324,8 +14378,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2983",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14333,8 +14387,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14342,8 +14396,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3214",
-   "self_type" : "type-3213",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14351,8 +14405,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3256",
-   "self_type" : "type-3255",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14360,8 +14414,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14369,8 +14423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3405",
-   "self_type" : "type-3404",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14378,8 +14432,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14387,8 +14441,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14396,8 +14450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14405,8 +14459,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14414,8 +14468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14423,8 +14477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14450,8 +14504,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -14468,8 +14522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14495,8 +14549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14504,8 +14558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14513,8 +14567,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14522,8 +14576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14531,8 +14585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14567,8 +14621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14577,7 +14631,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14585,8 +14639,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14594,8 +14648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14603,8 +14657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14621,7 +14675,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14630,7 +14684,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14639,7 +14693,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14648,8 +14702,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14657,8 +14711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14666,8 +14720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14675,7 +14729,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14684,7 +14738,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14693,7 +14747,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14702,7 +14756,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14712,7 +14766,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14738,8 +14792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14756,8 +14810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14765,8 +14819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14774,8 +14828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14783,8 +14837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14792,8 +14846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14801,8 +14855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14819,7 +14873,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14846,8 +14900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14855,7 +14909,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14864,8 +14918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14873,8 +14927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14882,8 +14936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14891,8 +14945,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14900,8 +14954,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2696",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-2698",
+   "self_type" : "type-2697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14909,8 +14963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14918,8 +14972,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3083",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14927,8 +14981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14936,8 +14990,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3204",
-   "self_type" : "type-3203",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14945,8 +14999,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14954,8 +15008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14972,8 +15026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14981,8 +15035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14990,8 +15044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14999,8 +15053,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15008,8 +15062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15017,8 +15071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3133",
+   "self_type" : "type-3132",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15026,8 +15080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3210",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15035,8 +15089,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15044,8 +15098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15053,8 +15107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15062,8 +15116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15071,8 +15125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15080,8 +15134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15089,8 +15143,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15098,8 +15152,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15107,8 +15161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2886",
+   "self_type" : "type-2885",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15116,8 +15170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3087",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15125,8 +15179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-3128",
+   "self_type" : "type-3127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15134,8 +15188,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3205",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15143,8 +15197,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15179,8 +15233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15188,8 +15242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15197,8 +15251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15206,8 +15260,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15215,8 +15269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15224,8 +15278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15233,8 +15287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15242,8 +15296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3127",
-   "self_type" : "type-3126",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15251,8 +15305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3208",
-   "self_type" : "type-3207",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15287,8 +15341,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15296,8 +15350,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15305,8 +15359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15314,8 +15368,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2875",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15323,8 +15377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15332,8 +15386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15341,8 +15395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15350,8 +15404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15359,8 +15413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2976",
-   "self_type" : "type-2975",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15368,8 +15422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15377,8 +15431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3211",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15386,8 +15440,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15404,8 +15458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15431,8 +15485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15449,8 +15503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15467,8 +15521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15476,8 +15530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15486,7 +15540,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15503,8 +15557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15512,8 +15566,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15521,8 +15575,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15530,8 +15584,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15539,8 +15593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15548,8 +15602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15557,8 +15611,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-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15575,8 +15629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15584,8 +15638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2299",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15602,8 +15656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -15611,8 +15665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15620,8 +15674,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-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -15630,7 +15684,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15638,8 +15692,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15647,8 +15701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15656,8 +15710,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3040",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3043",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15674,7 +15728,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -15683,8 +15737,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15719,8 +15773,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15728,8 +15782,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15746,8 +15800,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15755,8 +15809,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15764,8 +15818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15773,8 +15827,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15782,8 +15836,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15791,8 +15845,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15800,8 +15854,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15809,8 +15863,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15818,8 +15872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15872,8 +15926,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2229",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15890,8 +15944,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15899,8 +15953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15908,8 +15962,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15917,8 +15971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15926,8 +15980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15944,7 +15998,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15972,7 +16026,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15980,8 +16034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -16007,8 +16061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16016,8 +16070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16025,8 +16079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16034,8 +16088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16061,8 +16115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16070,8 +16124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16088,8 +16142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16097,8 +16151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2713",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16106,8 +16160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2879",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16115,8 +16169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16124,8 +16178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16133,8 +16187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2972",
-   "self_type" : "type-2974",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16142,8 +16196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16151,8 +16205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16160,8 +16214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16169,8 +16223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16178,8 +16232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16187,8 +16241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16196,8 +16250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2824",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16205,8 +16259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16214,8 +16268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16223,8 +16277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16232,8 +16286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16241,8 +16295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16250,8 +16304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16259,8 +16313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16268,8 +16322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16286,8 +16340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16295,8 +16349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16304,8 +16358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16322,8 +16376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16331,8 +16385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16349,8 +16403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "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/IBase.h"
   },
@@ -16358,8 +16412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16368,7 +16422,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16385,8 +16439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16394,8 +16448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16403,8 +16457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16412,8 +16466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16421,8 +16475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16439,8 +16493,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-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16448,8 +16502,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-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16466,8 +16520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16475,8 +16529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16484,8 +16538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16493,8 +16547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16502,8 +16556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16511,8 +16565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16520,7 +16574,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -16539,7 +16593,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16547,8 +16601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16556,8 +16610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16565,8 +16619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16574,7 +16628,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16583,8 +16637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16601,8 +16655,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16610,8 +16664,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16619,8 +16673,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16628,8 +16682,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16637,8 +16691,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16664,8 +16718,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16673,42 +16727,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -16716,8 +16734,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -16725,10 +16743,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16736,8 +16808,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16745,8 +16817,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16754,8 +16826,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16763,8 +16835,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16772,8 +16844,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16781,8 +16853,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16790,8 +16862,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16808,8 +16880,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16817,7 +16889,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16826,8 +16898,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16835,8 +16907,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16844,8 +16916,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16862,8 +16934,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-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16871,8 +16943,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16880,8 +16952,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16889,8 +16961,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16898,8 +16970,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16911,8 +16983,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16941,8 +17013,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16951,8 +17023,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16961,8 +17033,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16971,8 +17043,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16981,8 +17053,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16991,8 +17063,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17001,8 +17073,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17011,8 +17083,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17021,8 +17093,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17031,8 +17103,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17041,8 +17113,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17051,8 +17123,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17061,8 +17133,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17071,8 +17143,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17081,8 +17153,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17091,8 +17163,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2751",
-   "self_type" : "type-2753",
+   "referenced_type" : "type-2753",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17101,8 +17173,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2798",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17111,8 +17183,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2803",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17121,8 +17193,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2815",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2817",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17131,8 +17203,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17141,8 +17213,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2900",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17151,8 +17223,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17161,8 +17233,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17171,8 +17243,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17181,8 +17253,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3255",
-   "self_type" : "type-3257",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17191,8 +17263,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3306",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17201,8 +17273,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17211,8 +17283,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3570",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17221,8 +17293,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17231,8 +17303,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17241,8 +17313,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17251,8 +17323,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17261,8 +17333,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17291,8 +17363,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17308,24 +17380,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17340,24 +17412,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17373,8 +17445,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -17382,48 +17454,48 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2732",
-   "self_type" : "type-2731",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3015",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3378",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3381",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17431,8 +17503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -17452,7 +17524,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17481,8 +17553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17491,8 +17563,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17501,8 +17573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17511,8 +17583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17531,8 +17603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -17541,8 +17613,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17551,8 +17623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17561,8 +17633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17571,8 +17643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17581,8 +17653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17591,18 +17663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3195",
-   "self_type" : "type-3194",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17621,6 +17683,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GrallocMapper",
+   "name" : "const android::GrallocMapper",
    "referenced_type" : "type-613",
    "self_type" : "type-612",
    "size" : 4,
@@ -17631,8 +17703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17641,8 +17713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17651,8 +17723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -17661,8 +17733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -17671,7 +17743,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -17681,8 +17753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17692,7 +17764,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -17701,8 +17773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -17712,7 +17784,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2231",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17761,7 +17833,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -17771,8 +17843,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17791,8 +17863,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17801,8 +17873,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17811,8 +17883,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17821,8 +17893,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17831,8 +17903,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17852,7 +17924,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -17861,8 +17933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2283",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17871,8 +17943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17881,8 +17953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17901,7 +17973,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -17911,7 +17983,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17921,7 +17993,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17931,7 +18003,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17941,8 +18013,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17951,8 +18023,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17962,7 +18034,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17991,8 +18063,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -18001,8 +18073,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -18011,8 +18083,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18021,8 +18093,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18031,8 +18103,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18041,7 +18113,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18061,8 +18133,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18071,8 +18143,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18081,7 +18153,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18091,8 +18163,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18101,8 +18173,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2716",
+   "self_type" : "type-2715",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18111,8 +18183,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18121,8 +18193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18131,8 +18203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18141,8 +18213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18151,8 +18223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18161,8 +18233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18231,8 +18303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -18281,8 +18353,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -18331,8 +18403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18341,8 +18413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18351,8 +18423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18361,8 +18433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18371,8 +18443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18381,8 +18453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18391,8 +18463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2830",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18401,8 +18473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18411,8 +18483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18421,8 +18493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18431,8 +18503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18451,8 +18523,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18461,8 +18533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18471,8 +18543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18481,7 +18553,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -18511,8 +18583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18521,8 +18593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18541,8 +18613,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-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "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"
   },
@@ -18551,8 +18623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -18561,8 +18633,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-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "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"
   },
@@ -18591,8 +18663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -18601,8 +18673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -18611,8 +18683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18621,8 +18693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18631,8 +18703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18641,8 +18713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18651,8 +18723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18671,8 +18743,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-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18681,8 +18753,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-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18701,8 +18773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2289",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18711,8 +18783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2297",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18722,7 +18794,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18731,8 +18803,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -18741,8 +18813,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18751,8 +18823,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18762,7 +18834,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -18778,40 +18850,40 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3372",
-   "self_type" : "type-3371",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18819,8 +18891,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -18829,8 +18901,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -18839,8 +18911,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18856,192 +18928,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2586",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2836",
-   "self_type" : "type-2835",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2905",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3310",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19056,16 +19128,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19099,7 +19171,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -19109,8 +19181,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19119,8 +19191,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19130,7 +19202,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19159,8 +19231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19169,8 +19241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19179,8 +19251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3089",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19199,8 +19271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19209,8 +19281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19219,8 +19291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19229,8 +19301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19239,8 +19311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19249,8 +19321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19259,8 +19331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2162",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19269,8 +19341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19279,8 +19351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2656",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19289,8 +19361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19299,8 +19371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2849",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19309,8 +19381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19319,8 +19391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19329,8 +19401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19339,8 +19411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3154",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19349,8 +19421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3223",
+   "referenced_type" : "type-3227",
+   "self_type" : "type-3226",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19359,8 +19431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3264",
-   "self_type" : "type-3263",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19369,8 +19441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3315",
-   "self_type" : "type-3314",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19379,8 +19451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19389,8 +19461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19409,8 +19481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19419,8 +19491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19429,8 +19501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19449,8 +19521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19469,8 +19541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19479,8 +19551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19489,8 +19561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19499,8 +19571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19509,8 +19581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19519,8 +19591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19529,8 +19601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19539,8 +19611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19549,8 +19621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19559,8 +19631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19569,8 +19641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2854",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19579,8 +19651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19589,8 +19661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19599,8 +19671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19609,8 +19681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3161",
-   "self_type" : "type-3160",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19619,8 +19691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3230",
-   "self_type" : "type-3229",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19629,8 +19701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-3273",
+   "self_type" : "type-3272",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19639,8 +19711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3320",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3323",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19649,8 +19721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19659,8 +19731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19669,8 +19741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19689,8 +19761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19699,8 +19771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19709,8 +19781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19729,8 +19801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19739,8 +19811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19749,8 +19821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19759,8 +19831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19769,8 +19841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19779,8 +19851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19789,8 +19861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19799,8 +19871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19809,8 +19881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19819,8 +19891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19829,8 +19901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2857",
-   "self_type" : "type-2856",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19839,8 +19911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19849,8 +19921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19859,8 +19931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19869,8 +19941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3163",
-   "self_type" : "type-3162",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19879,8 +19951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3232",
-   "self_type" : "type-3231",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19889,8 +19961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19899,8 +19971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3323",
-   "self_type" : "type-3322",
+   "referenced_type" : "type-3326",
+   "self_type" : "type-3325",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19909,8 +19981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3465",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19919,8 +19991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19929,8 +20001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19949,8 +20021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19959,8 +20031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19979,8 +20051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19989,8 +20061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1790",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19999,8 +20071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20009,8 +20081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20019,8 +20091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20029,8 +20101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20039,8 +20111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20049,8 +20121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20059,8 +20131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20069,8 +20141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2765",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20079,8 +20151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20089,8 +20161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20099,8 +20171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3060",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20109,8 +20181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20119,8 +20191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3157",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20129,8 +20201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3228",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20139,8 +20211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3267",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20149,8 +20221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3319",
-   "self_type" : "type-3318",
+   "referenced_type" : "type-3322",
+   "self_type" : "type-3321",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20159,8 +20231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20169,8 +20241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20179,8 +20251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20189,8 +20261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20199,8 +20271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20209,8 +20281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20229,8 +20301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20249,8 +20321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20259,8 +20331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20269,8 +20341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20279,8 +20351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20289,8 +20361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20299,8 +20371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20309,8 +20381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20319,8 +20391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20329,8 +20401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20339,8 +20411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2772",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20349,8 +20421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20359,8 +20431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2936",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20369,8 +20441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3071",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20379,8 +20451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20389,8 +20461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3165",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20399,8 +20471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3234",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20409,8 +20481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3274",
-   "self_type" : "type-3273",
+   "referenced_type" : "type-3277",
+   "self_type" : "type-3276",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20419,8 +20491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20429,8 +20501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3467",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3470",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20439,8 +20511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20469,8 +20541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20479,8 +20551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20499,8 +20571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20509,8 +20581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1784",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20519,8 +20591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20529,8 +20601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20539,8 +20611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20549,8 +20621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20559,8 +20631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20569,8 +20641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20579,8 +20651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20589,8 +20661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2760",
-   "self_type" : "type-2759",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20599,8 +20671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20609,8 +20681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20619,8 +20691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20629,8 +20701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3056",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20639,8 +20711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20649,8 +20721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20659,8 +20731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20669,8 +20741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3313",
-   "self_type" : "type-3312",
+   "referenced_type" : "type-3316",
+   "self_type" : "type-3315",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20679,8 +20751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20689,8 +20761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20699,8 +20771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20719,8 +20791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20729,8 +20801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20759,8 +20831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20769,8 +20841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20779,8 +20851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20789,8 +20861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20799,8 +20871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20809,8 +20881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20819,8 +20891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20829,8 +20901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20839,8 +20911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20849,8 +20921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2763",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20859,8 +20931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2851",
-   "self_type" : "type-2850",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20869,8 +20941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2927",
-   "self_type" : "type-2926",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20879,8 +20951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20889,8 +20961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20899,8 +20971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20909,8 +20981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3226",
-   "self_type" : "type-3225",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20919,8 +20991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3265",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20929,8 +21001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3316",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20939,8 +21011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20949,8 +21021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20969,8 +21041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20979,8 +21051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20989,8 +21061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -21009,8 +21081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21029,8 +21101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21039,8 +21111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21049,8 +21121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21059,8 +21131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21069,8 +21141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21079,8 +21151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21089,8 +21161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21099,8 +21171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21109,8 +21181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21119,8 +21191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21129,8 +21201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2863",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21139,8 +21211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2943",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21149,8 +21221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21159,8 +21231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3170",
-   "self_type" : "type-3169",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21169,8 +21241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21179,8 +21251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3238",
-   "self_type" : "type-3237",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21189,8 +21261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3278",
-   "self_type" : "type-3277",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21199,8 +21271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3329",
-   "self_type" : "type-3328",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3331",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21209,8 +21281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21219,8 +21291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21229,8 +21301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21239,8 +21311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21249,8 +21321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21259,8 +21331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21269,8 +21341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21289,8 +21361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21299,8 +21371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21309,8 +21381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21319,8 +21391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21329,8 +21401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21339,8 +21411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21349,8 +21421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21359,8 +21431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21369,8 +21441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21379,8 +21451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2779",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21389,8 +21461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21399,8 +21471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21409,8 +21481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3077",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21419,8 +21491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3175",
-   "self_type" : "type-3174",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21429,8 +21501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21439,8 +21511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21449,8 +21521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3282",
-   "self_type" : "type-3281",
+   "referenced_type" : "type-3285",
+   "self_type" : "type-3284",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21459,8 +21531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21469,8 +21541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21479,8 +21551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21489,8 +21561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21509,8 +21581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21519,8 +21591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21529,8 +21601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21549,8 +21621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21559,8 +21631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1802",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21569,8 +21641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21579,8 +21651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21589,8 +21661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21599,8 +21671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21609,8 +21681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21619,8 +21691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21629,8 +21701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21639,8 +21711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2778",
-   "self_type" : "type-2777",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21649,8 +21721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21659,8 +21731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2945",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21669,8 +21741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21679,8 +21751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21689,8 +21761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21699,8 +21771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3240",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21709,8 +21781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3280",
-   "self_type" : "type-3279",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3282",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21719,8 +21791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
+   "referenced_type" : "type-3334",
+   "self_type" : "type-3333",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21729,8 +21801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21739,8 +21811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21759,8 +21831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21769,8 +21841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21779,8 +21851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21789,8 +21861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21809,8 +21881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21819,8 +21891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21829,8 +21901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21839,8 +21911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1990",
+   "self_type" : "type-1989",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21849,8 +21921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2070",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21859,8 +21931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21869,8 +21941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21879,8 +21951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21889,8 +21961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2668",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21899,8 +21971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21909,8 +21981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21919,8 +21991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21929,8 +22001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3073",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21939,8 +22011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21949,8 +22021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21959,8 +22031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3236",
-   "self_type" : "type-3235",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21969,8 +22041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3276",
-   "self_type" : "type-3275",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21979,8 +22051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3326",
+   "referenced_type" : "type-3330",
+   "self_type" : "type-3329",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21989,8 +22061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21999,8 +22071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22009,8 +22081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22019,8 +22091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22029,8 +22101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22039,8 +22111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22069,8 +22141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22079,8 +22151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1806",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22089,8 +22161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22099,8 +22171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22109,8 +22181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22119,8 +22191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22129,8 +22201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22139,8 +22211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22149,8 +22221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22159,8 +22231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2782",
-   "self_type" : "type-2781",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22169,8 +22241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22179,8 +22251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22189,8 +22261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3079",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22199,8 +22271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3177",
-   "self_type" : "type-3176",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22209,8 +22281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22219,8 +22291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22229,8 +22301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3284",
-   "self_type" : "type-3283",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3286",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22239,8 +22311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3335",
-   "self_type" : "type-3334",
+   "referenced_type" : "type-3338",
+   "self_type" : "type-3337",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22249,8 +22321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22259,8 +22331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22269,8 +22341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22289,8 +22361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22299,8 +22371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22309,8 +22381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22329,8 +22401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22339,8 +22411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22349,8 +22421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2088",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22359,8 +22431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22369,8 +22441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22379,8 +22451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22389,8 +22461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22399,8 +22471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22409,8 +22481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3187",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22419,8 +22491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22429,8 +22501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3292",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22439,8 +22511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22449,8 +22521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22459,8 +22531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22469,8 +22541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22479,8 +22551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22489,8 +22561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22499,8 +22571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22519,8 +22591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22529,8 +22601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22539,8 +22611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22549,8 +22621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22559,8 +22631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22569,8 +22641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22579,8 +22651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22589,8 +22661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22599,8 +22671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3185",
-   "self_type" : "type-3184",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22609,8 +22681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22619,8 +22691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3290",
-   "self_type" : "type-3289",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22629,8 +22701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22639,8 +22711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22649,8 +22721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22659,8 +22731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22669,8 +22741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22679,8 +22751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22689,8 +22761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22709,8 +22781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22719,8 +22791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22729,8 +22801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22739,8 +22811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22749,8 +22821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22759,8 +22831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22769,8 +22841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2786",
-   "self_type" : "type-2785",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22779,8 +22851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22789,8 +22861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22799,8 +22871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22809,8 +22881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3288",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22819,8 +22891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3339",
-   "self_type" : "type-3338",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22829,8 +22901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22839,8 +22911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22849,8 +22921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22859,8 +22931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22869,8 +22941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22899,8 +22971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22909,8 +22981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22919,8 +22991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22929,8 +23001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22939,8 +23011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22949,8 +23021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22959,8 +23031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2783",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22969,8 +23041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2952",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22979,8 +23051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22989,8 +23061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22999,8 +23071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3286",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23009,8 +23081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3336",
+   "referenced_type" : "type-3340",
+   "self_type" : "type-3339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23019,8 +23091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23029,8 +23101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23039,8 +23111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23049,8 +23121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23059,8 +23131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23069,8 +23141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23089,8 +23161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23099,8 +23171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23109,8 +23181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23119,8 +23191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23129,8 +23201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23139,8 +23211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2400",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23149,8 +23221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2792",
-   "self_type" : "type-2791",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23159,8 +23231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23169,8 +23241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3189",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23179,8 +23251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23189,8 +23261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23199,8 +23271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3345",
-   "self_type" : "type-3344",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23209,8 +23281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23219,8 +23291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23239,8 +23311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23249,8 +23321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23259,8 +23331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23269,8 +23341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23279,8 +23351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23289,8 +23361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23299,8 +23371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23309,8 +23381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23319,8 +23391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23329,8 +23401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2839",
-   "self_type" : "type-2838",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23339,8 +23411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2912",
-   "self_type" : "type-2911",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23349,8 +23421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23359,8 +23431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3148",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23369,8 +23441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3220",
-   "self_type" : "type-3219",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3222",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23379,8 +23451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23389,8 +23461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23399,8 +23471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23419,8 +23491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23429,8 +23501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2176",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23439,8 +23511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23449,8 +23521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3072",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3069",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23459,8 +23531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23469,8 +23541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23479,8 +23551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23489,8 +23561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23499,8 +23571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23509,8 +23581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23519,8 +23591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23529,8 +23601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23539,8 +23611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2730",
-   "self_type" : "type-2729",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23549,8 +23621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23559,8 +23631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-3367",
-   "self_type" : "type-3366",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23569,8 +23641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23589,8 +23661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23599,8 +23671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2747",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23609,8 +23681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23619,8 +23691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23629,8 +23701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23639,8 +23711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2808",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23649,8 +23721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3610",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23659,8 +23731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23669,8 +23741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-3300",
-   "self_type" : "type-3299",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23689,8 +23761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23709,8 +23781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23719,8 +23791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23729,8 +23801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23739,8 +23811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23749,8 +23821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23759,8 +23831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23769,8 +23841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23779,8 +23851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23789,8 +23861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2418",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23799,8 +23871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23809,8 +23881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2683",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23819,8 +23891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2794",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23829,8 +23901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2821",
-   "self_type" : "type-2820",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23839,8 +23911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
+   "referenced_type" : "type-2874",
+   "self_type" : "type-2873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23849,8 +23921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2964",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23859,8 +23931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3046",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23869,8 +23941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23879,8 +23951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3202",
-   "self_type" : "type-3201",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23889,8 +23961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23899,8 +23971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23909,8 +23981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23919,8 +23991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23929,8 +24001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23939,8 +24011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23959,8 +24031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23969,8 +24041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23979,8 +24051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23989,8 +24061,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23999,8 +24071,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -24009,8 +24081,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24028,7 +24100,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24037,8 +24109,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -24048,7 +24120,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -24057,8 +24129,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -24071,48 +24143,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -24123,23 +24195,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -24150,18 +24222,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -24172,63 +24244,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -24239,22 +24311,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -24271,7 +24343,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -24307,20 +24379,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -24408,7 +24480,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -24515,14 +24587,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -24563,13 +24635,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -24581,14 +24653,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -24598,14 +24670,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -24615,13 +24687,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -24633,20 +24705,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -24658,20 +24730,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -24693,11 +24765,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -24705,11 +24777,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -24761,36 +24833,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -24800,7 +24872,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -24809,20 +24881,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -24859,7 +24931,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -24868,20 +24940,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -24939,10 +25011,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -24951,62 +25023,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1024,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1088,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1120,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1152,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -25046,7 +25118,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 192,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 256,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 288,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -25058,100 +25214,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 192,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 256,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 288,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -25206,17 +25278,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "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-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -25232,11 +25304,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -25244,11 +25316,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -25292,11 +25364,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2221" ],
+   "template_args" : [ "type-2224" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25402,14 +25474,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -25421,14 +25493,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -25477,12 +25549,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -25501,14 +25573,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -25520,14 +25592,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -25539,14 +25611,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -25579,14 +25651,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -25626,8 +25698,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -25673,7 +25745,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2222"
+     "referenced_type" : "type-2225"
     }
    ],
    "fields" :
@@ -25681,14 +25753,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -25700,7 +25772,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -25717,11 +25789,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -25729,11 +25801,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -25742,17 +25814,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "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-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -25800,7 +25872,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -25857,14 +25929,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -25922,14 +25994,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -25941,14 +26013,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -25959,7 +26031,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -25968,62 +26040,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -26113,14 +26185,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -26168,17 +26240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -26223,17 +26295,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -26278,17 +26350,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -26333,17 +26405,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -26388,17 +26460,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -26445,32 +26517,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -26556,11 +26628,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -26580,7 +26652,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -26645,28 +26717,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2254"
+     "referenced_type" : "type-2257"
+    },
+    {
+     "referenced_type" : "type-2258"
     },
     {
      "referenced_type" : "type-2255"
     },
     {
-     "referenced_type" : "type-2252"
-    },
-    {
-     "referenced_type" : "type-2265"
-    },
-    {
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2269"
     },
     {
      "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     },
     {
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2271"
+    },
+    {
+     "referenced_type" : "type-2274"
     }
    ],
    "fields" :
@@ -26674,14 +26746,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2279"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26704,8 +26776,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26728,8 +26800,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26752,8 +26824,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26776,8 +26848,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26800,8 +26872,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26812,11 +26884,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -26824,8 +26896,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26836,11 +26908,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -26848,8 +26920,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26860,11 +26932,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26884,38 +26956,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -26923,27 +26995,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -26954,29 +27026,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -26986,35 +27058,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -27025,27 +27097,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -27077,8 +27149,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -27088,16 +27160,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -27220,12 +27292,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -27236,22 +27302,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -27259,21 +27331,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -27284,19 +27356,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -27307,19 +27379,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -27330,19 +27402,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -27352,9 +27424,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -27368,19 +27437,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -27391,21 +27463,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -27427,8 +27499,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -27450,8 +27522,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -27473,8 +27545,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -27484,12 +27556,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -27500,22 +27566,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -27523,33 +27595,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -27560,24 +27632,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -27588,24 +27660,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -27616,24 +27688,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -27643,35 +27715,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -27682,33 +27754,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -27735,8 +27807,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -27763,8 +27835,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -27791,8 +27863,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -27802,12 +27874,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -27818,22 +27884,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -27841,45 +27913,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -27890,29 +27962,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -27923,29 +27995,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -27956,29 +28028,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -27988,35 +28060,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -28027,45 +28099,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -28097,8 +28169,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -28130,8 +28202,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -28163,8 +28235,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -28186,8 +28258,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28198,11 +28270,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28210,8 +28282,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28222,8 +28294,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28234,11 +28306,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28246,8 +28318,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28258,11 +28330,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28270,8 +28342,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28282,11 +28354,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28294,8 +28366,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28318,8 +28390,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28330,11 +28402,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28342,8 +28414,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28354,8 +28426,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28366,11 +28438,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28378,8 +28450,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28390,11 +28462,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28402,8 +28474,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28414,11 +28486,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28426,8 +28498,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28450,11 +28522,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -28462,8 +28534,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28474,11 +28546,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -28486,8 +28558,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28498,11 +28570,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -28510,8 +28582,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28534,11 +28606,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -28546,8 +28618,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28558,11 +28630,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -28570,8 +28642,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28582,11 +28654,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -28594,8 +28666,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28606,8 +28678,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28618,11 +28690,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28630,8 +28702,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28642,11 +28714,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28654,8 +28726,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28666,11 +28738,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28678,8 +28750,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28702,8 +28774,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28714,11 +28786,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28726,8 +28798,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28738,8 +28810,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28750,11 +28822,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28762,8 +28834,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28774,11 +28846,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28798,11 +28870,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28810,8 +28882,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28877,7 +28949,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -28899,7 +28971,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -28908,32 +28980,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -29040,7 +29112,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29049,26 +29121,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -29157,22 +29229,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -29193,7 +29265,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -29281,14 +29353,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -29398,14 +29470,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -29486,14 +29558,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -29575,85 +29647,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -29671,26 +29743,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -29702,73 +29774,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -29792,20 +29864,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -29817,23 +29889,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -29844,7 +29916,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29853,55 +29925,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -29913,25 +29985,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -29949,26 +30021,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -30046,18 +30118,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -30067,7 +30139,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30076,17 +30148,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -30094,7 +30166,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30103,17 +30175,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -30121,7 +30193,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30130,17 +30202,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -30148,7 +30220,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -30158,7 +30230,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -30168,26 +30240,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -30293,7 +30365,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -30307,12 +30379,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1099",
    "self_type" : "type-1099",
@@ -30344,16 +30416,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -30371,7 +30443,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -30381,16 +30453,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1072",
    "self_type" : "type-1072",
@@ -30404,16 +30476,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -30423,19 +30495,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -30447,19 +30519,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_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<hidl_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<hidl_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<hidl_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-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -30479,7 +30551,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -30493,12 +30565,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1151",
    "self_type" : "type-1151",
@@ -30512,16 +30584,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -30531,19 +30603,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned 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<unsigned 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<unsigned 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-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -30565,7 +30637,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30577,8 +30649,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -30591,7 +30663,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -30605,7 +30677,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -30632,7 +30704,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -30641,7 +30713,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -30726,33 +30798,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -30762,7 +30834,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -30773,8 +30845,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30786,13 +30858,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -30822,7 +30894,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30852,7 +30924,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30877,13 +30949,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30894,11 +30966,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -30908,13 +30980,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30925,11 +30997,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -30962,23 +31034,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "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"
@@ -30989,13 +31061,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -31104,13 +31176,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "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",
@@ -31224,12 +31296,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -31238,7 +31310,7 @@
    "self_type" : "type-694",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31268,17 +31340,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -31288,17 +31360,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -31308,17 +31380,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -31328,17 +31400,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -31348,17 +31420,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -31368,17 +31440,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -31388,17 +31460,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -31408,17 +31480,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -31428,17 +31500,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -31448,17 +31520,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -31488,17 +31560,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "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-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -31508,36 +31580,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "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-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -31547,8 +31619,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31558,33 +31630,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31613,8 +31685,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31624,8 +31696,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31635,11 +31707,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -31650,26 +31722,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31679,11 +31751,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -31694,26 +31766,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -31723,22 +31795,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -31749,15 +31821,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -31767,8 +31839,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31778,11 +31850,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -31793,7 +31865,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31833,8 +31905,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31844,11 +31916,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -31859,18 +31931,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -31888,11 +31960,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -31903,18 +31975,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -31932,33 +32004,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -31976,8 +32048,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31987,11 +32059,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -32002,7 +32074,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32042,8 +32114,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32053,11 +32125,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -32068,7 +32140,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -32079,7 +32151,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -32101,18 +32173,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -32123,7 +32195,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -32141,41 +32213,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32185,8 +32257,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32196,22 +32268,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32240,11 +32312,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -32255,15 +32327,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32273,8 +32345,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32284,22 +32356,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -32310,7 +32382,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -32328,11 +32400,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -32343,18 +32415,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -32372,22 +32444,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -32398,15 +32470,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32427,30 +32499,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32460,8 +32532,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32475,18 +32547,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -32495,12 +32567,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -32518,20 +32590,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2284"
+     "referenced_type" : "type-2287"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32548,8 +32620,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32559,13 +32631,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32576,13 +32648,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32593,16 +32665,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -32633,12 +32705,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -32665,7 +32737,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -32687,7 +32759,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -32697,32 +32769,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -32739,33 +32811,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -32776,28 +32848,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -32872,43 +32944,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32919,108 +32991,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -33031,63 +33103,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -33098,33 +33180,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -33135,13 +33217,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -33152,7 +33234,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -33167,38 +33249,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -33264,12 +33346,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -33296,22 +33378,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -33343,27 +33425,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33395,27 +33477,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33447,32 +33529,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33494,28 +33576,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -33525,13 +33607,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33542,8 +33624,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33556,8 +33638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -33583,8 +33665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33592,8 +33674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33601,8 +33683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33619,7 +33701,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33628,7 +33710,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33637,7 +33719,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -33656,7 +33738,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33664,8 +33746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33673,8 +33755,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33682,8 +33764,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33691,8 +33773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33700,8 +33782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33709,7 +33791,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/32/x86/source-based/libui.so.lsdump b/29/32/x86/source-based/libui.so.lsdump
index ba6360c..8848d82 100644
--- a/29/32/x86/source-based/libui.so.lsdump
+++ b/29/32/x86/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -177,8 +168,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -187,16 +178,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -212,8 +203,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -221,16 +212,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -238,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -266,8 +257,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -276,8 +267,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -296,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -313,8 +304,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1805,11 +1796,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1971,11 +1962,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1993,11 +1984,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2023,7 +2014,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2045,11 +2036,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2072,11 +2063,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2102,11 +2093,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2124,11 +2115,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2142,11 +2133,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2160,11 +2151,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2182,7 +2173,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2196,11 +2187,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2214,11 +2205,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2232,11 +2223,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2254,7 +2245,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2272,7 +2263,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2290,7 +2281,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2308,7 +2299,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2322,11 +2313,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2340,11 +2331,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2358,11 +2349,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2377,11 +2368,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2407,7 +2398,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2429,7 +2420,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2451,11 +2442,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2509,7 +2500,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2563,7 +2554,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2665,11 +2656,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2723,7 +2714,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2765,7 +2756,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3007,7 +2998,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3033,7 +3024,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3127,7 +3118,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3161,7 +3152,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3271,11 +3262,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3341,7 +3332,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3599,7 +3590,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3721,7 +3712,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3751,7 +3742,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3865,11 +3856,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3939,7 +3930,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4213,7 +4204,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4243,7 +4234,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4369,7 +4360,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4391,11 +4382,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "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-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4433,11 +4424,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4467,11 +4458,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4521,7 +4512,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4575,7 +4566,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4601,7 +4592,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4643,7 +4634,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4885,7 +4876,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4915,7 +4906,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4945,7 +4936,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4987,7 +4978,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5025,7 +5016,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5051,7 +5042,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5069,7 +5060,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5099,7 +5090,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5193,7 +5184,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5235,7 +5226,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5253,7 +5244,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5283,7 +5274,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5317,7 +5308,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5371,7 +5362,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5384,18 +5375,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5408,11 +5399,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5426,26 +5417,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5456,15 +5447,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5474,18 +5465,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5495,33 +5486,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5531,36 +5522,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5570,33 +5561,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5606,36 +5597,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5645,15 +5693,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5663,18 +5711,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5684,12 +5732,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5699,15 +5747,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5717,15 +5765,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5735,24 +5783,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5762,12 +5810,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5777,12 +5825,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5795,14 +5843,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5813,27 +5861,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5843,12 +5891,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5858,18 +5906,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5884,7 +5932,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5896,7 +5944,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5908,7 +5956,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5920,7 +5968,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5932,7 +5980,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5941,10 +5989,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5956,7 +6004,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5968,7 +6016,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5980,7 +6028,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6067,7 +6115,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6076,7 +6124,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6086,10 +6134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6098,14 +6146,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6115,10 +6163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6128,18 +6176,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6149,10 +6197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6165,10 +6213,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6178,23 +6226,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6204,28 +6252,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6235,23 +6283,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6261,10 +6309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6273,14 +6321,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6290,10 +6338,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6303,18 +6351,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6324,10 +6372,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6340,10 +6388,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6353,23 +6401,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6379,28 +6427,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6410,23 +6458,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6436,16 +6484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6454,10 +6502,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6467,10 +6515,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6480,13 +6528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6496,25 +6544,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6525,10 +6573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6538,13 +6586,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6555,28 +6603,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6587,34 +6635,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6624,19 +6672,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6646,22 +6694,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6671,16 +6719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6690,22 +6738,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6718,10 +6766,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6730,10 +6778,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6745,13 +6793,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6763,7 +6811,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,24 +6821,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6800,27 +6848,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6830,10 +6878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6891,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,30 +6921,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6906,33 +6954,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6942,16 +6990,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6961,19 +7009,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6983,7 +7031,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -6998,7 +7046,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7008,34 +7056,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7045,26 +7093,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7074,25 +7122,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7101,7 +7149,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7111,29 +7159,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7143,10 +7191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7156,34 +7204,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7193,26 +7241,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7222,25 +7270,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7249,7 +7297,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7259,29 +7307,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7291,10 +7339,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7305,10 +7353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7319,10 +7367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7333,10 +7381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7345,16 +7393,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7364,10 +7412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7377,10 +7425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7396,10 +7444,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7415,7 +7463,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7431,7 +7479,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7444,7 +7492,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7457,7 +7505,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7483,13 +7531,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7499,13 +7547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7524,7 +7572,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7543,7 +7591,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7553,16 +7601,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7573,10 +7621,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7586,13 +7634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7602,19 +7650,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7624,28 +7672,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7655,16 +7703,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7674,34 +7722,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7711,25 +7759,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7739,19 +7787,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7761,30 +7809,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7794,13 +7842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7810,33 +7858,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7846,36 +7894,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7885,22 +7933,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7911,10 +7959,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7925,10 +7973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7937,16 +7985,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7956,13 +8004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7972,93 +8020,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8071,7 +8119,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8084,7 +8132,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8094,7 +8142,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8103,7 +8151,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8113,7 +8161,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8128,7 +8176,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8138,10 +8186,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8150,7 +8198,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8160,10 +8208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8199,13 +8247,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8215,13 +8263,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8231,10 +8279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8244,13 +8292,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8260,13 +8308,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8276,10 +8324,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8289,10 +8337,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8302,10 +8350,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8315,13 +8363,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2442",
+   "return_type" : "type-2444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8334,7 +8382,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8347,16 +8395,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8372,10 +8420,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8391,10 +8439,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8410,10 +8458,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8426,10 +8474,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8438,7 +8486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8456,7 +8504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8490,7 +8538,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8506,7 +8554,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8519,10 +8567,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8538,7 +8586,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8551,10 +8599,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8564,13 +8612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8580,13 +8628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8596,19 +8644,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8619,16 +8667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,22 +8687,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8665,16 +8713,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8684,16 +8732,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8703,10 +8751,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8716,22 +8764,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8741,19 +8789,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8763,25 +8811,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8791,19 +8839,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8813,25 +8861,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8840,10 +8888,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8853,13 +8901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8869,16 +8917,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8888,16 +8936,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8907,10 +8955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8920,13 +8968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8936,13 +8984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8952,19 +9000,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8974,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8990,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9006,19 +9054,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9028,13 +9076,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9044,13 +9092,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9060,19 +9108,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9082,10 +9130,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9102,7 +9150,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-10"
@@ -9111,7 +9159,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9121,19 +9169,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9143,16 +9191,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9162,16 +9210,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9181,13 +9229,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9197,13 +9245,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9213,10 +9261,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9226,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9242,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9258,10 +9306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9271,10 +9319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9284,10 +9332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9297,13 +9345,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9313,10 +9361,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9326,13 +9374,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9342,13 +9390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9358,7 +9406,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9373,7 +9421,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9383,13 +9431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9399,13 +9447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9415,13 +9463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9431,13 +9479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9447,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9463,13 +9511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9480,7 +9528,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9489,7 +9537,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9499,13 +9547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9515,13 +9563,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9531,13 +9579,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9548,7 +9596,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9557,7 +9605,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9567,25 +9615,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9595,7 +9643,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9608,10 +9656,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9621,16 +9669,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9650,7 +9698,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9664,13 +9712,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9684,13 +9732,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9704,16 +9752,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,16 +9775,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9750,16 +9798,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9773,16 +9821,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9792,10 +9840,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9805,28 +9853,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9836,7 +9884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9849,10 +9897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9862,7 +9910,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9875,7 +9923,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9890,7 +9938,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9900,10 +9948,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9913,13 +9961,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9929,28 +9977,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9960,16 +10008,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9979,16 +10027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9998,19 +10046,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10020,31 +10068,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10055,13 +10103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10071,25 +10119,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10099,31 +10147,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10133,13 +10181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10149,7 +10197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10162,10 +10210,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10175,16 +10223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10194,10 +10242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10207,34 +10255,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10244,7 +10292,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10257,10 +10305,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10270,13 +10318,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10286,13 +10334,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10305,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-6",
@@ -10318,10 +10366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10331,7 +10379,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10344,7 +10392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10357,7 +10405,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10370,7 +10418,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10383,13 +10431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10399,16 +10447,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
-    },
-    {
      "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2445"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10419,10 +10467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10432,10 +10480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10445,10 +10493,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10458,10 +10506,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2427",
+   "return_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10471,7 +10519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1246"
@@ -10491,13 +10539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10507,13 +10555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10523,13 +10571,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10539,7 +10587,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1280"
@@ -10555,16 +10603,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10574,10 +10622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10590,13 +10638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10644,13 +10692,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10714,7 +10762,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10727,7 +10775,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10740,7 +10788,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10753,7 +10801,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10778,7 +10826,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10788,13 +10836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10820,19 +10868,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10842,10 +10890,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10855,10 +10903,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-6",
@@ -10871,7 +10919,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10884,17 +10932,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10904,20 +10952,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10927,7 +10975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10940,13 +10988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,13 +11004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10972,19 +11020,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10994,16 +11042,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11013,7 +11061,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1284"
@@ -11029,13 +11077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11048,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11064,13 +11112,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,13 +11128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11096,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11150,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11173,16 +11221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,22 +11241,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11219,16 +11267,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11238,16 +11286,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11258,16 +11306,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11278,16 +11326,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11298,19 +11346,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,19 +11369,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11344,19 +11392,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11367,19 +11415,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11389,10 +11437,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11402,10 +11450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11415,7 +11463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11428,10 +11476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11441,10 +11489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11454,7 +11502,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11469,24 +11517,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11522,41 +11570,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2388",
+   "referenced_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11566,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11575,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11584,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11593,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11611,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11629,8 +11677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11647,8 +11695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11656,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11665,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11674,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11692,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11701,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11710,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11728,7 +11776,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11737,7 +11785,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11746,7 +11794,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11755,7 +11803,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11764,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11773,8 +11821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11782,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11791,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11800,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11818,7 +11866,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11827,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11836,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11845,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11854,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11863,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11872,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11890,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11909,7 +11957,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11917,8 +11965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11926,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11935,8 +11983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11944,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11953,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11962,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11986,50 +12034,50 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2167",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2054",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2428",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12045,7 +12093,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12054,8 +12102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12063,8 +12111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12081,8 +12129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12090,8 +12138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12099,8 +12147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12108,8 +12156,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2230",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12126,8 +12174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12135,8 +12183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12145,7 +12193,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12153,8 +12201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12180,8 +12228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12189,8 +12237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12198,8 +12246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12207,8 +12255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12216,8 +12264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12225,8 +12273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12234,8 +12282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12243,8 +12291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12297,8 +12345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12306,8 +12354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12315,8 +12363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12378,8 +12426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12397,7 +12445,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12414,8 +12462,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12423,8 +12471,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12450,8 +12498,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12459,7 +12507,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12468,7 +12516,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12477,7 +12525,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12492,30 +12540,30 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2209",
+   "referenced_type" : "type-2207",
    "self_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12538,106 +12586,106 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1789",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2344",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12650,15 +12698,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12697,8 +12745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12706,8 +12754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12716,7 +12764,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12733,8 +12781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12742,8 +12790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12751,8 +12799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12760,8 +12808,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-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12769,7 +12817,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2103",
+   "referenced_type" : "type-2099",
    "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12787,8 +12835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12796,8 +12844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12805,8 +12853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12814,8 +12862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12823,8 +12871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2669",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2674",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12832,8 +12880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12850,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12868,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12877,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12886,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12895,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12904,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12913,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1992",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12922,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12931,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12940,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12949,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12958,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12967,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2565",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12976,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12985,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12994,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13012,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13021,8 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13030,8 +13078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13039,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13048,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13057,7 +13105,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13067,7 +13115,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13093,7 +13141,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13102,7 +13150,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13111,8 +13159,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13120,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13129,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13138,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13147,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13156,8 +13204,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-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2150",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13165,8 +13213,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-2396",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13174,8 +13222,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-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13183,8 +13231,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-2449",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13201,7 +13249,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13210,7 +13258,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13219,7 +13267,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13231,8 +13279,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13240,8 +13288,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13249,7 +13297,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13276,8 +13324,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13285,8 +13333,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13294,8 +13342,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13303,8 +13351,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2653",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13321,8 +13369,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13330,8 +13378,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13339,8 +13387,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13348,8 +13396,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13357,8 +13405,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2678",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13375,8 +13423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13385,7 +13433,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13402,8 +13450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13420,8 +13468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13429,8 +13477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13438,8 +13486,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13447,8 +13495,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13465,8 +13513,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13474,8 +13522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13483,8 +13531,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13492,8 +13540,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13501,8 +13549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13510,8 +13558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13528,8 +13576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13537,8 +13585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13546,8 +13594,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13555,8 +13603,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13564,8 +13612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13573,8 +13621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13583,7 +13631,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13600,8 +13648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13609,8 +13657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13627,8 +13675,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13636,8 +13684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13645,8 +13693,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13663,8 +13711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13672,8 +13720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13699,8 +13747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13708,8 +13756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13765,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13726,8 +13774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13735,8 +13783,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +13792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13753,8 +13801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13762,8 +13810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13771,8 +13819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13780,8 +13828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13789,8 +13837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13798,8 +13846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13807,8 +13855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13816,8 +13864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13825,8 +13873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13834,8 +13882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13843,8 +13891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13852,8 +13900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13861,8 +13909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13870,8 +13918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13879,8 +13927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13888,8 +13936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13915,8 +13963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13933,8 +13981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13960,8 +14008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13978,8 +14026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13987,8 +14035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13996,8 +14044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14032,8 +14080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14042,7 +14090,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14050,8 +14098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14059,8 +14107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14068,8 +14116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14086,7 +14134,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14095,7 +14143,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14104,7 +14152,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14113,8 +14161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14122,8 +14170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14131,8 +14179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14140,7 +14188,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14149,7 +14197,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14158,7 +14206,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14167,7 +14215,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14177,7 +14225,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14203,8 +14251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14221,8 +14269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14230,8 +14278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14239,8 +14287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14248,8 +14296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14257,8 +14305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14266,8 +14314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14284,7 +14332,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14311,8 +14359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14320,7 +14368,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14329,8 +14377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14338,8 +14386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14347,8 +14395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14356,8 +14404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14365,8 +14413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14374,8 +14422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14383,8 +14431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14401,8 +14449,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14419,8 +14467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14428,8 +14476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14437,8 +14485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14446,8 +14494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14455,8 +14503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14464,8 +14512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14473,8 +14521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14482,8 +14530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14491,8 +14539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14500,8 +14548,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14509,8 +14557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14545,8 +14593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14554,8 +14602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14563,8 +14611,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14572,8 +14620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14581,8 +14629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14617,8 +14665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14626,8 +14674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14635,8 +14683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14644,8 +14692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14653,8 +14701,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14662,8 +14710,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14671,8 +14719,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14680,8 +14728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14698,8 +14746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14725,8 +14773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14743,8 +14791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14761,8 +14809,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14770,8 +14818,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,7 +14828,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14797,8 +14845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14806,8 +14854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14815,8 +14863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14824,8 +14872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14833,8 +14881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14842,8 +14890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14851,8 +14899,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-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14869,8 +14917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14878,8 +14926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14896,8 +14944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14905,8 +14953,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14914,8 +14962,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-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14924,7 +14972,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14932,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14941,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14959,7 +15007,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -14968,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15004,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15013,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15031,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15040,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15049,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15058,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15067,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15076,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15085,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15094,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15103,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15157,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15175,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15184,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15193,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15202,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15211,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15229,7 +15277,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15257,7 +15305,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15265,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -15292,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15301,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15310,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15319,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15346,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15355,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15373,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15382,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15391,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15400,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15409,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15418,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15427,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15436,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15445,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15454,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15463,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15472,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15481,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15490,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15499,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15508,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15526,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15535,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15544,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15562,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15571,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15589,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "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/IBase.h"
   },
@@ -15598,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -15608,7 +15656,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15625,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15679,8 +15727,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-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15688,8 +15736,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-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15706,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15715,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15724,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15733,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15742,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15751,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15760,7 +15808,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15779,7 +15827,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15787,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15796,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15805,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15814,7 +15862,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15823,8 +15871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15841,8 +15889,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15850,8 +15898,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15859,8 +15907,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15868,8 +15916,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15877,8 +15925,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15904,8 +15952,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15913,42 +15961,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -15956,8 +15968,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -15965,10 +15977,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15976,8 +16042,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15985,8 +16051,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15994,8 +16060,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16003,8 +16069,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16012,8 +16078,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16021,8 +16087,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16030,8 +16096,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16048,8 +16114,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16057,7 +16123,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16066,8 +16132,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16075,8 +16141,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16084,8 +16150,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16102,8 +16168,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-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16111,8 +16177,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16120,8 +16186,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16129,8 +16195,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16138,8 +16204,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16151,8 +16217,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16181,8 +16247,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16191,8 +16257,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16201,8 +16267,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16211,8 +16277,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16221,8 +16287,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16231,8 +16297,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16241,8 +16307,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16251,8 +16317,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16261,8 +16327,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16271,8 +16337,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16281,8 +16347,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16291,8 +16357,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2168",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16301,8 +16367,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16311,8 +16377,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16321,8 +16387,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16331,8 +16397,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16341,8 +16407,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16351,8 +16417,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16361,8 +16427,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16371,8 +16437,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16381,8 +16447,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16391,8 +16457,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16421,8 +16487,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16438,32 +16504,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16479,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16488,32 +16554,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16521,8 +16587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16542,7 +16608,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16571,8 +16637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16581,8 +16647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16591,8 +16657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16601,8 +16667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16621,8 +16687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16631,8 +16697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16641,8 +16707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16651,8 +16717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16661,8 +16727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16671,8 +16737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16691,8 +16757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16701,8 +16767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16711,8 +16777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16721,8 +16787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16731,7 +16797,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16741,8 +16807,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16752,7 +16818,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -16761,8 +16827,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16772,7 +16838,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2397",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16821,7 +16887,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16831,8 +16897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16851,8 +16917,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16861,8 +16927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16871,8 +16937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2386",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16881,8 +16947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16891,8 +16957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16912,7 +16978,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16921,8 +16987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2433",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16931,8 +16997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16941,8 +17007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16961,7 +17027,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16971,7 +17037,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -16981,7 +17047,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -16991,7 +17057,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17001,8 +17067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17011,8 +17077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17022,7 +17088,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17051,8 +17117,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17061,8 +17127,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17071,8 +17137,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17081,8 +17147,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17091,8 +17157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17101,7 +17167,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17121,8 +17187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17131,8 +17197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17141,7 +17207,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17151,8 +17217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17161,8 +17227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17171,8 +17237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17181,8 +17247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17257,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17201,8 +17267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17271,8 +17337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17321,8 +17387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17371,8 +17437,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17381,8 +17447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17391,8 +17457,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17401,8 +17467,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17411,8 +17477,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +17487,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17431,8 +17497,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17441,8 +17507,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17461,8 +17527,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17471,8 +17537,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17481,8 +17547,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17491,7 +17557,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17521,8 +17587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17531,8 +17597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17551,8 +17617,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-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "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"
   },
@@ -17561,8 +17627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17571,8 +17637,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-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "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"
   },
@@ -17601,8 +17667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17611,8 +17677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17621,8 +17687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17631,8 +17697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17641,8 +17707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17651,8 +17717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17661,8 +17727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17681,8 +17747,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-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17691,8 +17757,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-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17711,8 +17777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2439",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17721,8 +17787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2447",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17732,7 +17798,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17741,8 +17807,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17751,8 +17817,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17761,8 +17827,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17772,7 +17838,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17788,24 +17854,24 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17813,8 +17879,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17823,8 +17889,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17833,8 +17899,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17850,120 +17916,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17978,16 +18044,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18021,7 +18087,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18031,8 +18097,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18041,8 +18107,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18052,7 +18118,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18081,8 +18147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18091,8 +18157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18111,8 +18177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18121,8 +18187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18131,8 +18197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18141,8 +18207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18151,8 +18217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18161,8 +18227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18171,8 +18237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18181,8 +18247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18191,8 +18257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18201,8 +18267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18211,8 +18277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18221,8 +18287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18241,8 +18307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18251,8 +18317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18261,8 +18327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18281,8 +18347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18301,8 +18367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18311,8 +18377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18321,8 +18387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18331,8 +18397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18341,8 +18407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18351,8 +18417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18361,8 +18427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18371,8 +18437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2302",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18381,8 +18447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18391,8 +18457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18401,8 +18467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18411,8 +18477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18421,8 +18487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18441,8 +18507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18451,8 +18517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18461,8 +18527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18481,8 +18547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18491,8 +18557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18501,8 +18567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18511,8 +18577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18521,8 +18587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18531,8 +18597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18541,8 +18607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18551,8 +18617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18561,8 +18627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2353",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18571,8 +18637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18581,8 +18647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18591,8 +18657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18601,8 +18667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18621,8 +18687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18631,8 +18697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18651,8 +18717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18661,8 +18727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18671,8 +18737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18681,8 +18747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18691,8 +18757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18701,8 +18767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18711,8 +18777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18721,8 +18787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18731,8 +18797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18741,8 +18807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18751,8 +18817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18761,8 +18827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18771,8 +18837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18781,8 +18847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18791,8 +18857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18801,8 +18867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18821,8 +18887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18841,8 +18907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18851,8 +18917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18861,8 +18927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18871,8 +18937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18881,8 +18947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18891,8 +18957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18901,8 +18967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18911,8 +18977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18921,8 +18987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18931,8 +18997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18941,8 +19007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18951,8 +19017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18981,8 +19047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18991,8 +19057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19011,8 +19077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19021,8 +19087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19031,8 +19097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19041,8 +19107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19051,8 +19117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +19127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2185",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +19137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2254",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +19147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +19157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +19167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +19177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +19187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19131,8 +19197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19151,8 +19217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19161,8 +19227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19191,8 +19257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19201,8 +19267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19211,8 +19277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19221,8 +19287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19231,8 +19297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19241,8 +19307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19251,8 +19317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19261,8 +19327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19271,8 +19337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2349",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19281,8 +19347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19291,8 +19357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19301,8 +19367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19321,8 +19387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19331,8 +19397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19341,8 +19407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19361,8 +19427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19381,8 +19447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19391,8 +19457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19401,8 +19467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19411,8 +19477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19421,8 +19487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19431,8 +19497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19441,8 +19507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19451,8 +19517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19461,8 +19527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2360",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19471,8 +19537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19481,8 +19547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19491,8 +19557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19501,8 +19567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19511,8 +19577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19521,8 +19587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19531,8 +19597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19541,8 +19607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19561,8 +19627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19571,8 +19637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19581,8 +19647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19591,8 +19657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19601,8 +19667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19611,8 +19677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19621,8 +19687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2274",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19631,8 +19697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19641,8 +19707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19651,8 +19717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19661,8 +19727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19671,8 +19737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19681,8 +19747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19701,8 +19767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19711,8 +19777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19721,8 +19787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19741,8 +19807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19751,8 +19817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19761,8 +19827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19771,8 +19837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19781,8 +19847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19791,8 +19857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19801,8 +19867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19811,8 +19877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19821,8 +19887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19831,8 +19897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19841,8 +19907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19851,8 +19917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19871,8 +19937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19881,8 +19947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19891,8 +19957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19901,8 +19967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19921,8 +19987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19931,8 +19997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19941,8 +20007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19951,8 +20017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19961,8 +20027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19971,8 +20037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19981,8 +20047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19991,8 +20057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20001,8 +20067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20011,8 +20077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20021,8 +20087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20031,8 +20097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20041,8 +20107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20051,8 +20117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20061,8 +20127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20071,8 +20137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20101,8 +20167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20111,8 +20177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20121,8 +20187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20131,8 +20197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20141,8 +20207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20151,8 +20217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20161,8 +20227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20171,8 +20237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2316",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20181,8 +20247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20191,8 +20257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20201,8 +20267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20211,8 +20277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20221,8 +20287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20241,8 +20307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20251,8 +20317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20261,8 +20327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20281,8 +20347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20291,8 +20357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20301,8 +20367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20311,8 +20377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2284",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20321,8 +20387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20331,8 +20397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20341,8 +20407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20351,8 +20417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20361,8 +20427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20371,8 +20437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20381,8 +20447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20391,8 +20457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20411,8 +20477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20421,8 +20487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20431,8 +20497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20441,8 +20507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20451,8 +20517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20461,8 +20527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20471,8 +20537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20481,8 +20547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20491,8 +20557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20501,8 +20567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20511,8 +20577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20521,8 +20587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20541,8 +20607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20551,8 +20617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1984",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20561,8 +20627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2215",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20571,8 +20637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2280",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20581,8 +20647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2320",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20591,8 +20657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20601,8 +20667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20611,8 +20677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20621,8 +20687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20631,8 +20697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20641,8 +20707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20671,8 +20737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20681,8 +20747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20691,8 +20757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20701,8 +20767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20711,8 +20777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20721,8 +20787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20731,8 +20797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20741,8 +20807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20751,8 +20817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20761,8 +20827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20771,8 +20837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20781,8 +20847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20801,8 +20867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20811,8 +20877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20821,8 +20887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20831,8 +20897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20841,8 +20907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20851,8 +20917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20861,8 +20927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20871,8 +20937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20891,8 +20957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20901,8 +20967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20911,8 +20977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20921,8 +20987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20931,8 +20997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20941,8 +21007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20951,8 +21017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20961,8 +21027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2181",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20971,8 +21037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20981,8 +21047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20991,8 +21057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21001,8 +21067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21021,8 +21087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21031,8 +21097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21041,8 +21107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21051,8 +21117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21061,8 +21127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21071,46 +21137,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2405",
    "self_type" : "type-2404",
    "size" : 4,
@@ -21119,10 +21145,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21141,8 +21207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21151,8 +21217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21161,8 +21227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21171,8 +21237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21181,8 +21247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21191,8 +21257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21211,8 +21277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21231,8 +21297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21241,8 +21307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21251,8 +21317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21261,8 +21327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21271,8 +21337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21281,8 +21347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21291,8 +21357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21301,8 +21367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21311,8 +21377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21321,8 +21387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21331,8 +21397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21341,8 +21407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21351,8 +21417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21361,8 +21427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21371,8 +21437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21391,8 +21457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21401,8 +21467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21411,8 +21477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21421,8 +21487,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21431,8 +21497,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21441,8 +21507,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21460,7 +21526,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21469,8 +21535,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21480,7 +21546,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21489,8 +21555,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21503,48 +21569,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21555,23 +21621,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21582,18 +21648,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21604,63 +21670,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21671,22 +21737,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21703,7 +21769,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -21739,20 +21805,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21840,7 +21906,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -21947,14 +22013,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -21995,13 +22061,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22013,14 +22079,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22030,14 +22096,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22047,13 +22113,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22065,20 +22131,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22090,20 +22156,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22125,11 +22191,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22137,11 +22203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22193,36 +22259,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22232,7 +22298,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -22241,20 +22307,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22291,7 +22357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -22300,20 +22366,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22371,10 +22437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -22383,62 +22449,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 992,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1056,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1088,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1120,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22478,7 +22544,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 160,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 224,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 256,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 44,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -22490,100 +22640,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 160,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 224,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 256,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 44,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22638,17 +22704,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "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-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22664,11 +22730,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22676,11 +22742,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22724,11 +22790,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2389" ],
+   "template_args" : [ "type-2391" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22834,14 +22900,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22853,14 +22919,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22909,12 +22975,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22933,14 +22999,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22952,14 +23018,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22971,14 +23037,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23011,14 +23077,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23058,8 +23124,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23105,7 +23171,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2392"
     }
    ],
    "fields" :
@@ -23113,14 +23179,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23132,7 +23198,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23149,11 +23215,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23161,11 +23227,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23174,17 +23240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "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-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23232,7 +23298,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -23289,14 +23355,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23354,14 +23420,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23373,14 +23439,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23391,7 +23457,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -23400,62 +23466,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23545,14 +23611,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23600,17 +23666,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23655,17 +23721,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23710,17 +23776,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23765,17 +23831,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23820,17 +23886,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -23877,32 +23943,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -23988,11 +24054,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24012,7 +24078,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24077,28 +24143,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2410"
+     "referenced_type" : "type-2412"
+    },
+    {
+     "referenced_type" : "type-2413"
     },
     {
      "referenced_type" : "type-2411"
     },
     {
-     "referenced_type" : "type-2409"
-    },
-    {
-     "referenced_type" : "type-2417"
-    },
-    {
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2420"
     },
     {
      "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     },
     {
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2422"
+    },
+    {
+     "referenced_type" : "type-2425"
     }
    ],
    "fields" :
@@ -24106,14 +24172,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24136,8 +24202,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2425",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24160,8 +24226,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24184,8 +24250,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24208,8 +24274,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24232,8 +24298,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24244,11 +24310,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24256,8 +24322,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24268,11 +24334,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24280,8 +24346,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24292,11 +24358,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24316,38 +24382,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24355,27 +24421,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24386,29 +24452,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24418,35 +24484,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24457,27 +24523,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24509,8 +24575,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24520,16 +24586,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -24652,12 +24718,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -24668,22 +24728,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -24691,21 +24757,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24716,19 +24782,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24739,19 +24805,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24762,19 +24828,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24784,9 +24850,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -24800,19 +24863,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -24823,21 +24889,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -24859,8 +24925,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -24882,8 +24948,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -24905,8 +24971,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -24916,12 +24982,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -24932,22 +24992,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -24955,33 +25021,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -24992,24 +25058,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25020,24 +25086,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25048,24 +25114,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25075,35 +25141,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -25114,33 +25180,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -25167,8 +25233,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -25195,8 +25261,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -25223,8 +25289,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -25234,12 +25300,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -25250,22 +25310,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25273,45 +25339,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25322,29 +25388,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25355,29 +25421,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25388,29 +25454,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25420,35 +25486,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25459,45 +25525,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25529,8 +25595,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25562,8 +25628,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25595,8 +25661,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25618,8 +25684,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25630,11 +25696,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25642,8 +25708,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25654,8 +25720,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25666,11 +25732,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25678,8 +25744,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25690,11 +25756,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25702,8 +25768,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25714,11 +25780,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25726,8 +25792,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25750,8 +25816,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25762,11 +25828,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25774,8 +25840,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25786,8 +25852,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25798,11 +25864,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25810,8 +25876,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25822,11 +25888,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25834,8 +25900,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25846,11 +25912,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25858,8 +25924,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25882,11 +25948,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25894,8 +25960,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25906,11 +25972,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25918,8 +25984,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25930,11 +25996,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25942,8 +26008,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25966,11 +26032,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -25978,8 +26044,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25990,11 +26056,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26002,8 +26068,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26014,11 +26080,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26026,8 +26092,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26038,8 +26104,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26050,11 +26116,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26062,8 +26128,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26074,11 +26140,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26086,8 +26152,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26098,11 +26164,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26110,8 +26176,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26134,8 +26200,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26146,11 +26212,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26158,8 +26224,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26170,8 +26236,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26182,11 +26248,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26194,8 +26260,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26206,11 +26272,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26230,11 +26296,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26242,8 +26308,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26309,7 +26375,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26331,7 +26397,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -26340,32 +26406,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26472,7 +26538,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -26481,26 +26547,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26589,22 +26655,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26625,7 +26691,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26713,14 +26779,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26830,14 +26896,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26918,14 +26984,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27007,85 +27073,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -27103,26 +27169,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27134,73 +27200,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -27224,20 +27290,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27249,23 +27315,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 32,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 96,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27276,7 +27342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -27285,55 +27351,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -27345,25 +27411,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -27381,26 +27447,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27478,18 +27544,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27499,7 +27565,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27508,17 +27574,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27526,7 +27592,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27535,17 +27601,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27553,7 +27619,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27562,17 +27628,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27580,7 +27646,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27590,7 +27656,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27600,26 +27666,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27725,7 +27791,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -27739,12 +27805,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1099",
    "self_type" : "type-1099",
@@ -27776,16 +27842,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27803,7 +27869,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27813,16 +27879,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1072",
    "self_type" : "type-1072",
@@ -27836,16 +27902,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27855,19 +27921,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27879,19 +27945,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_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<hidl_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<hidl_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<hidl_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-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27911,7 +27977,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27925,12 +27991,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1151",
    "self_type" : "type-1151",
@@ -27944,16 +28010,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27963,19 +28029,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned 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<unsigned 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<unsigned 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-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -27997,7 +28063,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28009,8 +28075,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28023,7 +28089,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -28037,7 +28103,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28064,7 +28130,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -28073,7 +28139,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28158,33 +28224,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28194,7 +28260,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -28205,8 +28271,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28218,13 +28284,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28254,7 +28320,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28284,7 +28350,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28309,13 +28375,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28326,11 +28392,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28340,13 +28406,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28357,11 +28423,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28394,23 +28460,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "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"
@@ -28421,13 +28487,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28536,13 +28602,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "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",
@@ -28656,12 +28722,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28670,7 +28736,7 @@
    "self_type" : "type-694",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28700,17 +28766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28720,17 +28786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28740,17 +28806,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28760,17 +28826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28780,17 +28846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28800,17 +28866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28820,17 +28886,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28840,17 +28906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28860,17 +28926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28880,17 +28946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28920,17 +28986,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "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-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28940,36 +29006,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "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-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28979,8 +29045,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -28990,33 +29056,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29045,8 +29111,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29056,8 +29122,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29067,11 +29133,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29082,26 +29148,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29111,11 +29177,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29126,26 +29192,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -29155,22 +29221,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29181,15 +29247,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29199,8 +29265,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29210,11 +29276,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29225,7 +29291,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29265,8 +29331,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29276,11 +29342,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29291,18 +29357,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29320,11 +29386,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -29335,18 +29401,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29364,33 +29430,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -29408,8 +29474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29419,11 +29485,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29434,7 +29500,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29474,8 +29540,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29485,11 +29551,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29500,7 +29566,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29511,7 +29577,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29533,18 +29599,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -29555,7 +29621,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -29573,41 +29639,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29617,8 +29683,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29628,22 +29694,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29672,11 +29738,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29687,15 +29753,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29705,8 +29771,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29716,22 +29782,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29742,7 +29808,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29760,11 +29826,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29775,18 +29841,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -29804,22 +29870,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29830,15 +29896,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29859,30 +29925,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29892,8 +29958,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29907,18 +29973,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -29927,12 +29993,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29950,20 +30016,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2437"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29980,8 +30046,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -29991,13 +30057,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2383"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30008,13 +30074,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30025,16 +30091,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -30065,12 +30131,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -30097,7 +30163,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30119,7 +30185,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30129,32 +30195,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30171,33 +30237,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30208,28 +30274,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30304,43 +30370,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30351,108 +30417,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30463,63 +30529,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30530,33 +30606,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30567,13 +30643,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30584,7 +30660,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30599,38 +30675,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30696,12 +30772,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30728,22 +30804,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30775,27 +30851,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30827,27 +30903,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30879,32 +30955,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30926,28 +31002,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30957,13 +31033,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30974,8 +31050,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30988,8 +31064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31015,8 +31091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31024,8 +31100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31033,8 +31109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31051,7 +31127,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31060,7 +31136,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31069,7 +31145,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31088,7 +31164,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31096,8 +31172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31105,8 +31181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31114,8 +31190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31123,8 +31199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31141,7 +31217,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/arm64_armv8-a/source-based/libui.so.lsdump b/29/64/arm64_armv8-a/source-based/libui.so.lsdump
index 00e04b0..4cf0e62 100644
--- a/29/64/arm64_armv8-a/source-based/libui.so.lsdump
+++ b/29/64/arm64_armv8-a/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-510",
-   "self_type" : "type-509",
+   "referenced_type" : "type-508",
+   "self_type" : "type-507",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-218",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-203",
+   "self_type" : "type-2431",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-290",
+   "referenced_type" : "type-287",
    "self_type" : "type-1260",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-144",
+   "referenced_type" : "type-105",
+   "self_type" : "type-146",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-565",
+   "referenced_type" : "type-105",
+   "self_type" : "type-562",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-207",
+   "referenced_type" : "type-220",
    "self_type" : "type-1267",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1110",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-351",
+   "referenced_type" : "type-125",
+   "self_type" : "type-348",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [12]",
    "name" : "unsigned long [12]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-560",
+   "referenced_type" : "type-126",
+   "self_type" : "type-557",
    "size" : 96,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [25]",
    "name" : "unsigned long [25]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-559",
+   "referenced_type" : "type-126",
+   "self_type" : "type-556",
    "size" : 200,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [3]",
    "name" : "unsigned long [3]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-944",
+   "referenced_type" : "type-126",
+   "self_type" : "type-936",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 8,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-525",
+   "referenced_type" : "type-230",
+   "self_type" : "type-522",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-599",
-   "size" : 24,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-521",
+   "referenced_type" : "type-230",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-578",
+   "referenced_type" : "type-230",
+   "self_type" : "type-575",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -154,8 +145,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-526",
+   "referenced_type" : "type-230",
+   "self_type" : "type-523",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   }
@@ -178,8 +169,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 1
   },
   {
@@ -188,16 +179,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 8
   },
   {
@@ -213,8 +204,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -222,16 +213,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 16
   },
   {
@@ -239,8 +230,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 8
   },
   {
@@ -267,8 +258,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -277,8 +268,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -287,8 +278,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -297,8 +288,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 8
   },
   {
@@ -314,8 +305,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150"
+   "referenced_type" : "type-153",
+   "self_type" : "type-153"
   }
  ],
  "elf_functions" :
@@ -1806,7 +1797,7 @@
    "self_type" : "type-618",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1968,11 +1959,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1990,11 +1981,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2020,7 +2011,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2042,11 +2033,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2069,11 +2060,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2099,11 +2090,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-207",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2121,11 +2112,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2139,11 +2130,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2157,11 +2148,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-863",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2179,7 +2170,7 @@
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2193,11 +2184,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2211,11 +2202,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2229,11 +2220,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-427",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2251,7 +2242,7 @@
    "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2269,7 +2260,7 @@
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2287,7 +2278,7 @@
    "self_type" : "type-1142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2305,7 +2296,7 @@
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2319,11 +2310,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2337,11 +2328,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2355,11 +2346,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2374,11 +2365,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2404,7 +2395,7 @@
    "self_type" : "type-1320",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2426,7 +2417,7 @@
    "self_type" : "type-1130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2448,11 +2439,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2506,7 +2497,7 @@
    "self_type" : "type-1306",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2560,7 +2551,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2662,11 +2653,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2720,7 +2711,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2762,7 +2753,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3004,7 +2995,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3030,7 +3021,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3124,7 +3115,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3158,7 +3149,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3268,11 +3259,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3338,7 +3329,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3596,7 +3587,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3718,7 +3709,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3748,7 +3739,7 @@
    "self_type" : "type-1172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3862,11 +3853,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3936,7 +3927,7 @@
    "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4210,7 +4201,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4240,7 +4231,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4366,7 +4357,7 @@
    "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4388,11 +4379,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "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-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4430,11 +4421,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4464,11 +4455,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4518,7 +4509,7 @@
    "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4572,7 +4563,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4598,7 +4589,7 @@
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4640,7 +4631,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4882,7 +4873,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4912,7 +4903,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4942,7 +4933,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4984,7 +4975,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5022,7 +5013,7 @@
    "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5048,7 +5039,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5066,7 +5057,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5096,7 +5087,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5190,7 +5181,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5232,7 +5223,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5250,7 +5241,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5280,7 +5271,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5314,7 +5305,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5368,7 +5359,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5381,18 +5372,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-273",
+   "referenced_type" : "type-269",
    "return_type" : "type-6",
-   "self_type" : "type-273",
+   "self_type" : "type-269",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5405,11 +5396,11 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
    "referenced_type" : "type-609",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-609",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5423,26 +5414,26 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5453,15 +5444,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "referenced_type" : "type-583",
-   "return_type" : "type-103",
-   "self_type" : "type-583",
+   "referenced_type" : "type-580",
+   "return_type" : "type-105",
+   "self_type" : "type-580",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5471,18 +5462,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-592",
+   "return_type" : "type-105",
+   "self_type" : "type-592",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5492,33 +5483,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-103",
-   "self_type" : "type-591",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5528,36 +5519,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-598",
-   "return_type" : "type-103",
-   "self_type" : "type-598",
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5567,33 +5558,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     }
    ],
-   "referenced_type" : "type-587",
-   "return_type" : "type-103",
-   "self_type" : "type-587",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5603,36 +5594,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-593",
-   "return_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-581"
+    },
+    {
+     "referenced_type" : "type-143"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-581"
+    },
+    {
+     "referenced_type" : "type-143"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-599",
+   "return_type" : "type-105",
+   "self_type" : "type-599",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5642,15 +5690,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-589",
-   "return_type" : "type-103",
-   "self_type" : "type-589",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5660,18 +5708,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-552"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-554",
-   "return_type" : "type-103",
-   "self_type" : "type-554",
+   "referenced_type" : "type-551",
+   "return_type" : "type-105",
+   "self_type" : "type-551",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5681,12 +5729,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     }
    ],
-   "referenced_type" : "type-574",
-   "return_type" : "type-103",
-   "self_type" : "type-574",
+   "referenced_type" : "type-571",
+   "return_type" : "type-105",
+   "self_type" : "type-571",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5696,15 +5744,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "referenced_type" : "type-572",
-   "return_type" : "type-103",
-   "self_type" : "type-572",
+   "referenced_type" : "type-569",
+   "return_type" : "type-105",
+   "self_type" : "type-569",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5714,15 +5762,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-567",
-   "return_type" : "type-103",
-   "self_type" : "type-567",
+   "referenced_type" : "type-564",
+   "return_type" : "type-105",
+   "self_type" : "type-564",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5732,24 +5780,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-570",
-   "return_type" : "type-103",
-   "self_type" : "type-570",
+   "referenced_type" : "type-567",
+   "return_type" : "type-105",
+   "self_type" : "type-567",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5759,12 +5807,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
-   "referenced_type" : "type-562",
-   "return_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-559",
+   "return_type" : "type-105",
+   "self_type" : "type-559",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5774,12 +5822,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-251",
-   "return_type" : "type-103",
-   "self_type" : "type-251",
+   "referenced_type" : "type-253",
+   "return_type" : "type-105",
+   "self_type" : "type-253",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5792,14 +5840,14 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-574"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-611",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "self_type" : "type-611",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5810,27 +5858,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-226"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-228"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-211",
-   "return_type" : "type-150",
-   "self_type" : "type-211",
+   "referenced_type" : "type-224",
+   "return_type" : "type-153",
+   "self_type" : "type-224",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5840,12 +5888,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-521"
     }
    ],
-   "referenced_type" : "type-523",
-   "return_type" : "type-150",
-   "self_type" : "type-523",
+   "referenced_type" : "type-520",
+   "return_type" : "type-153",
+   "self_type" : "type-520",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5855,18 +5903,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-574"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-576",
-   "return_type" : "type-150",
-   "self_type" : "type-576",
+   "referenced_type" : "type-573",
+   "return_type" : "type-153",
+   "self_type" : "type-573",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5881,7 +5929,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5893,7 +5941,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5905,7 +5953,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5917,7 +5965,7 @@
      "referenced_type" : "type-1193"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5929,7 +5977,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5938,10 +5986,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5953,7 +6001,7 @@
      "referenced_type" : "type-1172"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5965,7 +6013,7 @@
      "referenced_type" : "type-1214"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5977,7 +6025,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6064,7 +6112,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1043"
@@ -6073,7 +6121,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-1443",
+   "return_type" : "type-1446",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6083,10 +6131,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6095,14 +6143,14 @@
      "referenced_type" : "type-1051"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6112,10 +6160,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6125,18 +6173,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6146,10 +6194,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6162,10 +6210,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6175,23 +6223,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6201,28 +6249,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6232,23 +6280,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6258,10 +6306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6270,14 +6318,14 @@
      "referenced_type" : "type-1051"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6287,10 +6335,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6300,18 +6348,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6321,10 +6369,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6337,10 +6385,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6350,23 +6398,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6376,28 +6424,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6407,23 +6455,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6433,16 +6481,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1428"
+     "referenced_type" : "type-1432"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6451,10 +6499,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6464,10 +6512,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6477,13 +6525,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     },
     {
-     "referenced_type" : "type-1402"
+     "referenced_type" : "type-1406"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6493,25 +6541,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6522,10 +6570,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6535,13 +6583,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6552,28 +6600,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6584,34 +6632,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6621,19 +6669,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6643,22 +6691,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6668,16 +6716,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6687,22 +6735,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6715,10 +6763,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-622",
+   "return_type" : "type-623",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6727,10 +6775,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-623"
     }
    ],
-   "return_type" : "type-681",
+   "return_type" : "type-680",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6739,16 +6787,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-625",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6760,7 +6808,7 @@
      "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6770,24 +6818,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6797,27 +6845,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6827,10 +6875,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6840,27 +6888,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6870,30 +6918,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6903,33 +6951,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6939,16 +6987,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6958,19 +7006,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6980,7 +7028,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-1250"
@@ -6995,7 +7043,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7005,34 +7053,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7042,26 +7090,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7071,25 +7119,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1133"
@@ -7098,7 +7146,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7108,29 +7156,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7140,10 +7188,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7153,34 +7201,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7190,26 +7238,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7219,25 +7267,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1133"
@@ -7246,7 +7294,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7256,29 +7304,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1472"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7288,10 +7336,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7302,10 +7350,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7316,10 +7364,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7330,10 +7378,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7342,16 +7390,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7361,10 +7409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-342"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7374,10 +7422,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-342"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7393,10 +7441,10 @@
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7412,7 +7460,7 @@
      "referenced_type" : "type-971"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7428,7 +7476,7 @@
      "referenced_type" : "type-971"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7441,7 +7489,7 @@
      "referenced_type" : "type-967"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7454,7 +7502,7 @@
      "referenced_type" : "type-967"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7480,13 +7528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7496,13 +7544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7521,7 +7569,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7540,7 +7588,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7550,16 +7598,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     },
     {
      "referenced_type" : "type-1362"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7570,10 +7618,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7583,13 +7631,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-1470",
+   "return_type" : "type-1473",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7599,19 +7647,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7621,28 +7669,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7652,16 +7700,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7671,34 +7719,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7708,25 +7756,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7736,19 +7784,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7758,30 +7806,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7791,13 +7839,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7807,33 +7855,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7843,36 +7891,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7882,22 +7930,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7908,10 +7956,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7922,10 +7970,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7934,16 +7982,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2451"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7953,13 +8001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7969,93 +8017,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-345"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1471"
+     "referenced_type" : "type-1474"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8068,7 +8116,7 @@
      "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8081,7 +8129,7 @@
      "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8091,7 +8139,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
      "referenced_type" : "type-10"
@@ -8100,7 +8148,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8110,7 +8158,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
      "referenced_type" : "type-10"
@@ -8125,7 +8173,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8135,10 +8183,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8147,7 +8195,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8157,10 +8205,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8196,13 +8244,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8212,13 +8260,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8228,10 +8276,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8241,13 +8289,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8257,13 +8305,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8273,10 +8321,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8286,10 +8334,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8299,10 +8347,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8312,13 +8360,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2443",
+   "return_type" : "type-2445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8331,7 +8379,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8344,16 +8392,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8369,10 +8417,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8388,10 +8436,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8407,10 +8455,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8423,10 +8471,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8435,7 +8483,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "referenced_type" : "type-1362"
@@ -8453,7 +8501,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-890"
+     "referenced_type" : "type-882"
     },
     {
      "referenced_type" : "type-1362"
@@ -8487,7 +8535,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8503,7 +8551,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8516,10 +8564,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8535,7 +8583,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8548,10 +8596,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8561,13 +8609,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8577,13 +8625,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8593,19 +8641,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8616,16 +8664,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8636,22 +8684,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8710,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8681,16 +8729,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8700,10 +8748,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8713,22 +8761,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8738,19 +8786,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8760,25 +8808,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8788,19 +8836,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8810,25 +8858,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8837,10 +8885,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2390",
+   "return_type" : "type-2392",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8850,13 +8898,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8866,16 +8914,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8885,16 +8933,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8904,10 +8952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8917,13 +8965,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8933,13 +8981,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8949,19 +8997,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8971,13 +9019,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8987,13 +9035,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9003,19 +9051,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9025,13 +9073,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9041,13 +9089,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9057,19 +9105,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9079,10 +9127,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
@@ -9099,7 +9147,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-10"
@@ -9108,7 +9156,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9118,19 +9166,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9140,16 +9188,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9159,16 +9207,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9178,13 +9226,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9194,13 +9242,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9210,10 +9258,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9223,13 +9271,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9239,13 +9287,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9255,10 +9303,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9268,10 +9316,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9281,10 +9329,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9294,13 +9342,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9310,10 +9358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9323,13 +9371,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9339,13 +9387,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9355,7 +9403,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1250"
@@ -9370,7 +9418,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9380,13 +9428,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9396,13 +9444,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9412,13 +9460,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9428,13 +9476,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9444,13 +9492,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1411"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9460,13 +9508,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9477,7 +9525,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
@@ -9486,7 +9534,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9496,13 +9544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9512,13 +9560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1411"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9528,13 +9576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9545,7 +9593,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
@@ -9554,7 +9602,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9564,25 +9612,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-528",
+   "return_type" : "type-525",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-545",
+   "return_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9592,7 +9640,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     }
    ],
    "return_type" : "type-6",
@@ -9605,10 +9653,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9618,16 +9666,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9647,7 +9695,7 @@
      "referenced_type" : "type-1120"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9661,13 +9709,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9681,13 +9729,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9701,16 +9749,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9724,16 +9772,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9747,16 +9795,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9770,16 +9818,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9789,10 +9837,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9802,28 +9850,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9833,7 +9881,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
    "return_type" : "type-637",
@@ -9846,10 +9894,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9859,10 +9907,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-629",
+   "return_type" : "type-630",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9872,7 +9920,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     },
     {
      "referenced_type" : "type-1249"
@@ -9887,7 +9935,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9897,10 +9945,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9910,13 +9958,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9926,28 +9974,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9957,16 +10005,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
      "referenced_type" : "type-1123"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9976,16 +10024,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9995,19 +10043,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10017,31 +10065,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10052,13 +10100,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-350"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10068,25 +10116,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10096,31 +10144,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10130,13 +10178,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10146,7 +10194,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
    "return_type" : "type-6",
@@ -10162,7 +10210,7 @@
      "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10175,13 +10223,13 @@
      "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10191,10 +10239,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10204,34 +10252,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10241,7 +10289,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "return_type" : "type-6",
@@ -10254,10 +10302,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10267,13 +10315,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10283,13 +10331,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10302,7 +10350,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-6",
@@ -10315,10 +10363,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10328,7 +10376,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10341,7 +10389,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10354,7 +10402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10367,7 +10415,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10380,13 +10428,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10396,16 +10444,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
-    },
-    {
      "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-2446"
+    },
+    {
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10416,10 +10464,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10429,10 +10477,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,10 +10490,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-2435",
+   "return_type" : "type-2437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10455,10 +10503,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-2428",
+   "return_type" : "type-2430",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10468,7 +10516,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1246"
@@ -10488,13 +10536,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2390",
+   "return_type" : "type-2392",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10504,7 +10552,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1051"
@@ -10520,7 +10568,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1055"
@@ -10536,7 +10584,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1279"
@@ -10552,13 +10600,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-25",
@@ -10571,10 +10619,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-1055",
@@ -10587,13 +10635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2435",
+   "return_type" : "type-2437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10641,13 +10689,13 @@
      "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10711,7 +10759,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10724,7 +10772,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10737,7 +10785,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10750,7 +10798,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10775,7 +10823,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10785,13 +10833,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10801,13 +10849,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10817,19 +10865,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10839,10 +10887,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10852,10 +10900,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-6",
@@ -10868,7 +10916,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
    "return_type" : "type-1297",
@@ -10881,17 +10929,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10901,20 +10949,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
-    },
-    {
      "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-2399"
+    },
+    {
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10924,7 +10972,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
    "return_type" : "type-1297",
@@ -10937,13 +10985,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10953,13 +11001,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10969,19 +11017,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10991,16 +11039,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11010,7 +11058,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1283"
@@ -11026,13 +11074,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11045,10 +11093,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2396"
+     "referenced_type" : "type-2398"
     }
    ],
    "return_type" : "type-1297",
@@ -11061,13 +11109,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11077,13 +11125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11093,19 +11141,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11115,13 +11163,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11131,13 +11179,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11147,19 +11195,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11170,16 +11218,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11190,22 +11238,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11216,16 +11264,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11235,16 +11283,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11255,16 +11303,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11275,16 +11323,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11295,19 +11343,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11318,19 +11366,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11341,19 +11389,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11364,19 +11412,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11386,10 +11434,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11399,10 +11447,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11412,7 +11460,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
    "return_type" : "type-6",
@@ -11425,10 +11473,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11438,10 +11486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11451,7 +11499,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11466,24 +11514,24 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11519,41 +11567,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2389",
+   "referenced_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-541",
+   "referenced_type" : "type-538",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-546",
+   "referenced_type" : "type-543",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11563,8 +11611,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11572,8 +11620,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11581,8 +11629,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-540",
+   "self_type" : "type-542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11590,8 +11638,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11599,7 +11647,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities &",
    "name" : "android::HdrCapabilities &",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -11608,8 +11656,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-258",
+   "referenced_type" : "type-282",
+   "self_type" : "type-1378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11626,8 +11674,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-264",
-   "self_type" : "type-268",
+   "referenced_type" : "type-260",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11644,8 +11692,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11653,8 +11701,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-178",
-   "self_type" : "type-187",
+   "referenced_type" : "type-180",
+   "self_type" : "type-189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11662,8 +11710,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-287",
-   "self_type" : "type-893",
+   "referenced_type" : "type-284",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11671,8 +11719,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2389",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11689,8 +11737,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2436",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11698,8 +11746,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-340",
-   "self_type" : "type-411",
+   "referenced_type" : "type-336",
+   "self_type" : "type-408",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11707,8 +11755,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-415",
-   "self_type" : "type-446",
+   "referenced_type" : "type-411",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11725,7 +11773,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1092",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11743,8 +11791,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-68",
+   "self_type" : "type-1397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -11761,8 +11809,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-199",
+   "referenced_type" : "type-52",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11770,8 +11818,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-218",
-   "self_type" : "type-332",
+   "referenced_type" : "type-203",
+   "self_type" : "type-329",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11779,8 +11827,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11788,8 +11836,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-394",
-   "self_type" : "type-401",
+   "referenced_type" : "type-393",
+   "self_type" : "type-398",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11797,8 +11845,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11815,7 +11863,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11824,8 +11872,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11833,8 +11881,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11842,8 +11890,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11851,8 +11899,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11860,8 +11908,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-429",
+   "self_type" : "type-428",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11869,8 +11917,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-177",
+   "referenced_type" : "type-122",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11887,8 +11935,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-130",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11906,7 +11954,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1358",
-   "self_type" : "type-1412",
+   "self_type" : "type-1416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11914,8 +11962,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-357",
-   "self_type" : "type-379",
+   "referenced_type" : "type-354",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11923,8 +11971,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-485",
-   "self_type" : "type-491",
+   "referenced_type" : "type-482",
+   "self_type" : "type-488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11932,8 +11980,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-334",
-   "self_type" : "type-387",
+   "referenced_type" : "type-331",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11941,8 +11989,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-53",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11950,8 +11998,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-498",
-   "self_type" : "type-504",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11959,8 +12007,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2445",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11983,49 +12031,49 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2168",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2412",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2055",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-965",
+   "referenced_type" : "type-959",
    "self_type" : "type-975",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
@@ -12042,7 +12090,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1034",
+   "referenced_type" : "type-1031",
    "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12051,8 +12099,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1399",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12060,8 +12108,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12078,8 +12126,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-356",
+   "referenced_type" : "type-343",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12087,8 +12135,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12096,8 +12144,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12105,8 +12153,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12132,8 +12180,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12142,7 +12190,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12150,7 +12198,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-615",
+   "referenced_type" : "type-616",
    "self_type" : "type-632",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
@@ -12177,8 +12225,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12186,8 +12234,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-186",
+   "referenced_type" : "type-186",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12195,8 +12243,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-890",
+   "referenced_type" : "type-866",
+   "self_type" : "type-882",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12204,8 +12252,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12213,8 +12261,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-928",
-   "self_type" : "type-935",
+   "referenced_type" : "type-920",
+   "self_type" : "type-929",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12222,8 +12270,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2435",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12231,8 +12279,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-406",
-   "self_type" : "type-407",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12240,8 +12288,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-439",
+   "referenced_type" : "type-431",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12294,8 +12342,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-176",
-   "self_type" : "type-185",
+   "referenced_type" : "type-171",
+   "self_type" : "type-184",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12303,8 +12351,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-331",
+   "referenced_type" : "type-324",
+   "self_type" : "type-328",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12312,8 +12360,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-232",
-   "self_type" : "type-233",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12375,8 +12423,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-131",
-   "self_type" : "type-132",
+   "referenced_type" : "type-133",
+   "self_type" : "type-134",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12394,7 +12442,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12411,8 +12459,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12420,8 +12468,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12447,8 +12495,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2441",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12456,7 +12504,7 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-372",
+   "referenced_type" : "type-369",
    "self_type" : "type-1287",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12465,7 +12513,7 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-854",
+   "referenced_type" : "type-851",
    "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12474,7 +12522,7 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-564",
+   "referenced_type" : "type-561",
    "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12489,8 +12537,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12503,16 +12551,16 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2418",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-563",
-   "self_type" : "type-838",
+   "referenced_type" : "type-560",
+   "self_type" : "type-836",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12535,127 +12583,127 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-127",
+   "self_type" : "type-129",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-38",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1788",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2177",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2252",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2294",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2345",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-38",
+   "self_type" : "type-40",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-414",
+   "referenced_type" : "type-409",
+   "self_type" : "type-417",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "self_type" : "type-645",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-748",
+   "referenced_type" : "type-749",
    "self_type" : "type-751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-857",
+   "referenced_type" : "type-857",
+   "self_type" : "type-859",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12694,8 +12742,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12703,8 +12751,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-830",
+   "referenced_type" : "type-825",
+   "self_type" : "type-827",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12730,8 +12778,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12739,8 +12787,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2130",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2126",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12748,8 +12796,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-1018",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1026",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12757,8 +12805,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-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12766,7 +12814,7 @@
    "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-2102",
+   "referenced_type" : "type-2100",
    "self_type" : "type-2114",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12784,8 +12832,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12793,8 +12841,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2227",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12802,8 +12850,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1406",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12811,8 +12859,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12820,8 +12868,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2671",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12829,8 +12877,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2335",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12847,8 +12895,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-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12865,8 +12913,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-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12874,8 +12922,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-1711",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1711",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12883,8 +12931,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-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12892,8 +12940,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-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12901,8 +12949,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-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12910,8 +12958,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-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12919,8 +12967,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-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12928,8 +12976,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-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12937,8 +12985,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-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12946,8 +12994,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-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12955,8 +13003,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-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12964,8 +13012,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-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12973,8 +13021,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-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12982,8 +13030,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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12991,8 +13039,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-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13009,8 +13057,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13018,8 +13066,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-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13027,8 +13075,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-963",
-   "self_type" : "type-962",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13036,8 +13084,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-823",
+   "referenced_type" : "type-227",
+   "self_type" : "type-814",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13045,7 +13093,7 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-237",
+   "referenced_type" : "type-239",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13054,8 +13102,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-852",
+   "referenced_type" : "type-240",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13064,7 +13112,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-831",
-   "self_type" : "type-835",
+   "self_type" : "type-832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13090,7 +13138,7 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13099,7 +13147,7 @@
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-596",
+   "referenced_type" : "type-593",
    "self_type" : "type-1347",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13108,8 +13156,8 @@
    "alignment" : 8,
    "linker_set_key" : "long &",
    "name" : "long &",
-   "referenced_type" : "type-286",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13117,8 +13165,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13126,8 +13174,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13135,8 +13183,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13144,8 +13192,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13153,8 +13201,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-2148",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13162,8 +13210,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-2398",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2399",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13171,8 +13219,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-2445",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13180,8 +13228,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-2450",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13189,8 +13237,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-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-724",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13198,7 +13246,7 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13207,7 +13255,7 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long &",
    "name" : "unsigned long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13216,7 +13264,7 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-217",
+   "referenced_type" : "type-230",
    "self_type" : "type-1249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13228,8 +13276,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13237,8 +13285,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
+   "referenced_type" : "type-624",
+   "self_type" : "type-623",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13246,7 +13294,7 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-519",
+   "referenced_type" : "type-516",
    "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13273,8 +13321,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13282,8 +13330,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13291,8 +13339,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13300,8 +13348,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13318,8 +13366,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13327,8 +13375,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13336,8 +13384,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13345,8 +13393,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2621",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13354,8 +13402,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2680",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13372,8 +13420,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-539",
+   "referenced_type" : "type-515",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13382,7 +13430,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-980",
-   "self_type" : "type-1007",
+   "self_type" : "type-1003",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13399,8 +13447,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-263",
+   "referenced_type" : "type-256",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13417,8 +13465,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1398",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13426,8 +13474,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13435,8 +13483,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1405",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13444,8 +13492,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13462,8 +13510,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13471,8 +13519,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-362",
+   "referenced_type" : "type-352",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13480,8 +13528,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-333",
-   "self_type" : "type-339",
+   "referenced_type" : "type-330",
+   "self_type" : "type-342",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13489,8 +13537,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-681",
+   "referenced_type" : "type-524",
+   "self_type" : "type-680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13498,8 +13546,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-546",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13507,8 +13555,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-541",
+   "referenced_type" : "type-526",
+   "self_type" : "type-538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13516,7 +13564,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities *",
    "name" : "android::HdrCapabilities *",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-967",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -13525,8 +13573,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13534,8 +13582,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13543,8 +13591,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1953",
-   "self_type" : "type-1952",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13552,8 +13600,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-291",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13561,8 +13609,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
+   "referenced_type" : "type-435",
+   "self_type" : "type-434",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13570,8 +13618,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13580,7 +13628,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13597,8 +13645,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-256",
+   "referenced_type" : "type-282",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13606,8 +13654,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-259",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1380",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13624,8 +13672,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-264",
-   "self_type" : "type-266",
+   "referenced_type" : "type-260",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13633,8 +13681,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-269",
+   "referenced_type" : "type-263",
+   "self_type" : "type-265",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13642,8 +13690,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-271",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13660,8 +13708,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-248",
+   "referenced_type" : "type-174",
+   "self_type" : "type-250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13669,8 +13717,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13696,8 +13744,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13705,8 +13753,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13714,8 +13762,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13723,8 +13771,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13732,8 +13780,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1782",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13741,8 +13789,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13750,8 +13798,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13759,8 +13807,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13768,8 +13816,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13777,8 +13825,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13786,8 +13834,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2016",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13795,8 +13843,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13804,8 +13852,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13813,8 +13861,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13822,8 +13870,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13831,8 +13879,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13840,8 +13888,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2623",
+   "referenced_type" : "type-2626",
+   "self_type" : "type-2625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13849,8 +13897,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2649",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13858,8 +13906,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13867,8 +13915,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-515",
-   "self_type" : "type-514",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13885,8 +13933,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-853",
+   "self_type" : "type-852",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13912,8 +13960,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-197",
-   "self_type" : "type-196",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13930,8 +13978,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13948,7 +13996,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
-   "referenced_type" : "type-710",
+   "referenced_type" : "type-711",
    "self_type" : "type-712",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
@@ -13957,8 +14005,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-188",
+   "referenced_type" : "type-180",
+   "self_type" : "type-190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13966,8 +14014,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-902",
+   "referenced_type" : "type-284",
+   "self_type" : "type-894",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13975,8 +14023,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13984,8 +14032,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13993,8 +14041,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<long> *",
    "name" : "android::Vector<long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14029,8 +14077,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2433",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14039,7 +14087,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-911",
-   "self_type" : "type-958",
+   "self_type" : "type-952",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14047,8 +14095,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2425",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14056,8 +14104,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-405",
+   "referenced_type" : "type-336",
+   "self_type" : "type-402",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14065,8 +14113,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-415",
-   "self_type" : "type-433",
+   "referenced_type" : "type-411",
+   "self_type" : "type-430",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14083,7 +14131,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14101,7 +14149,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14119,8 +14167,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-165",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14128,8 +14176,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-326",
+   "referenced_type" : "type-203",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14174,7 +14222,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1379",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14200,8 +14248,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14218,8 +14266,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-198",
+   "self_type" : "type-197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14227,8 +14275,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14236,8 +14284,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
+   "referenced_type" : "type-279",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14245,8 +14293,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14254,8 +14302,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-394",
-   "self_type" : "type-399",
+   "referenced_type" : "type-393",
+   "self_type" : "type-396",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14263,8 +14311,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14281,7 +14329,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1308",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14308,8 +14356,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-168",
+   "referenced_type" : "type-122",
+   "self_type" : "type-170",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14317,7 +14365,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1314",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14326,8 +14374,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14335,8 +14383,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14344,8 +14392,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14353,8 +14401,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14362,8 +14410,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14371,8 +14419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "type-356",
+   "self_type" : "type-355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14380,8 +14428,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14389,8 +14437,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14398,8 +14446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-836",
+   "referenced_type" : "type-838",
+   "self_type" : "type-837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14407,8 +14455,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14416,8 +14464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14425,8 +14473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14434,8 +14482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "type-484",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14443,8 +14491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-739",
+   "self_type" : "type-738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14461,8 +14509,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14470,8 +14518,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14479,8 +14527,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14488,8 +14536,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14497,8 +14545,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14506,8 +14554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14515,8 +14563,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-690",
+   "self_type" : "type-689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14542,8 +14590,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14551,8 +14599,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14560,8 +14608,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14569,8 +14617,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2159",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14578,8 +14626,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14587,17 +14635,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14621,10 +14660,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14632,8 +14680,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14641,8 +14689,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-351",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14650,8 +14698,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2007",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14659,8 +14707,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14668,8 +14716,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14677,8 +14725,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14722,8 +14770,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14740,8 +14788,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-130",
+   "self_type" : "type-131",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14758,8 +14806,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-366",
+   "referenced_type" : "type-173",
+   "self_type" : "type-363",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14767,8 +14815,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-374",
+   "referenced_type" : "type-294",
+   "self_type" : "type-371",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14777,7 +14825,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14794,8 +14842,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-682",
+   "referenced_type" : "type-679",
+   "self_type" : "type-683",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14803,8 +14851,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-378",
+   "referenced_type" : "type-354",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14812,8 +14860,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-489",
+   "referenced_type" : "type-482",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14821,8 +14869,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-334",
-   "self_type" : "type-386",
+   "referenced_type" : "type-331",
+   "self_type" : "type-383",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14830,8 +14878,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14839,8 +14887,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-498",
-   "self_type" : "type-503",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14848,8 +14896,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-373",
-   "self_type" : "type-375",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14866,8 +14914,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14875,8 +14923,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14893,8 +14941,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-524",
+   "referenced_type" : "type-517",
+   "self_type" : "type-521",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14902,8 +14950,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-347",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14911,8 +14959,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-273",
-   "self_type" : "type-276",
+   "referenced_type" : "type-269",
+   "self_type" : "type-272",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14921,7 +14969,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-352",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14929,8 +14977,8 @@
    "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-577",
+   "referenced_type" : "type-287",
+   "self_type" : "type-574",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14938,8 +14986,8 @@
    "alignment" : 8,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2072",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2074",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14948,7 +14996,7 @@
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "type-627",
-   "self_type" : "type-629",
+   "self_type" : "type-630",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14957,7 +15005,7 @@
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "type-639",
-   "self_type" : "type-640",
+   "self_type" : "type-641",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14965,8 +15013,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-537",
+   "referenced_type" : "type-534",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15001,8 +15049,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1401",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15010,8 +15058,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15028,8 +15076,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1434",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15037,8 +15085,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-364",
+   "referenced_type" : "type-360",
+   "self_type" : "type-361",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15046,8 +15094,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-347",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15055,8 +15103,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-626",
+   "self_type" : "type-625",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15064,8 +15112,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15073,8 +15121,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15091,8 +15139,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15100,8 +15148,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2402",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15154,8 +15202,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15172,8 +15220,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-183",
-   "self_type" : "type-184",
+   "referenced_type" : "type-186",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15181,8 +15229,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-881",
+   "referenced_type" : "type-866",
+   "self_type" : "type-877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15190,8 +15238,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15199,8 +15247,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<long> *",
    "name" : "const android::Vector<long> *",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1430",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15208,8 +15256,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15226,7 +15274,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-928",
+   "referenced_type" : "type-920",
    "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15254,7 +15302,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1056",
-   "self_type" : "type-1422",
+   "self_type" : "type-1426",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15262,7 +15310,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-40",
+   "referenced_type" : "type-42",
    "self_type" : "type-147",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
@@ -15289,8 +15337,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-202",
+   "self_type" : "type-214",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15298,8 +15346,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15307,8 +15355,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-401",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15316,8 +15364,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15343,8 +15391,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-299",
+   "referenced_type" : "type-292",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15352,8 +15400,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-203",
+   "referenced_type" : "type-191",
+   "self_type" : "type-216",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15370,8 +15418,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15379,8 +15427,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15388,8 +15436,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-385",
+   "referenced_type" : "type-380",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15397,8 +15445,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2007",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15406,8 +15454,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-497",
+   "referenced_type" : "type-492",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15415,8 +15463,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-155",
+   "self_type" : "type-154",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15424,8 +15472,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
+   "referenced_type" : "type-161",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15433,8 +15481,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-421",
+   "self_type" : "type-420",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15442,8 +15490,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15451,8 +15499,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15460,8 +15508,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15469,8 +15517,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15478,8 +15526,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15487,8 +15535,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15496,8 +15544,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15505,8 +15553,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15523,8 +15571,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-154",
+   "referenced_type" : "type-156",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15532,8 +15580,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-161",
+   "referenced_type" : "type-162",
+   "self_type" : "type-163",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15541,8 +15589,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15559,8 +15607,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-146",
+   "referenced_type" : "type-148",
+   "self_type" : "type-149",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15568,8 +15616,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-133",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15586,8 +15634,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-175",
+   "referenced_type" : "type-172",
+   "self_type" : "type-178",
    "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/IBase.h"
   },
@@ -15595,8 +15643,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-298",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "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"
   },
@@ -15605,7 +15653,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15622,8 +15670,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-382",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15631,8 +15679,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-494",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15640,8 +15688,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-390",
+   "referenced_type" : "type-386",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15649,8 +15697,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15658,8 +15706,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-506",
-   "self_type" : "type-507",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15676,8 +15724,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-367",
-   "self_type" : "type-368",
+   "referenced_type" : "type-364",
+   "self_type" : "type-365",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15685,8 +15733,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-376",
-   "self_type" : "type-377",
+   "referenced_type" : "type-373",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15703,8 +15751,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15712,8 +15760,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15721,8 +15769,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15730,8 +15778,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15739,8 +15787,8 @@
    "alignment" : 8,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15748,8 +15796,8 @@
    "alignment" : 8,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-556",
-   "self_type" : "type-555",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15757,7 +15805,7 @@
    "alignment" : 8,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15776,7 +15824,7 @@
    "linker_set_key" : "const long *",
    "name" : "const long *",
    "referenced_type" : "type-848",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15784,8 +15832,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15793,8 +15841,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-141",
-   "self_type" : "type-348",
+   "referenced_type" : "type-143",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15802,8 +15850,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15811,7 +15859,7 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-237",
+   "referenced_type" : "type-239",
    "self_type" : "type-1105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15820,8 +15868,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "type-229",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15838,8 +15886,8 @@
    "alignment" : 8,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-568",
+   "referenced_type" : "type-544",
+   "self_type" : "type-565",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15847,8 +15895,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-548",
-   "self_type" : "type-558",
+   "referenced_type" : "type-545",
+   "self_type" : "type-555",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15856,8 +15904,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15865,8 +15913,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-552",
-   "self_type" : "type-551",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15874,8 +15922,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15901,8 +15949,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15910,8 +15958,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15919,8 +15967,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15928,8 +15976,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15937,8 +15985,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15946,8 +15994,26 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "self_type" : "type-589",
+   "size" : 8,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 8,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-599",
+   "self_type" : "type-598",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15955,8 +16021,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
    "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15964,8 +16030,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15973,8 +16039,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15982,8 +16048,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-572",
-   "self_type" : "type-571",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15991,8 +16057,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16000,8 +16066,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16009,8 +16075,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16018,8 +16084,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-251",
-   "self_type" : "type-252",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16027,8 +16093,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-596",
+   "referenced_type" : "type-105",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16045,8 +16111,8 @@
    "alignment" : 8,
    "linker_set_key" : "long *",
    "name" : "long *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16054,7 +16120,7 @@
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-143",
+   "referenced_type" : "type-145",
    "self_type" : "type-1133",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16063,8 +16129,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16072,8 +16138,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16081,8 +16147,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-126",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16090,8 +16156,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16108,8 +16174,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-211",
-   "self_type" : "type-210",
+   "referenced_type" : "type-224",
+   "self_type" : "type-223",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16117,8 +16183,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16126,8 +16192,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16135,8 +16201,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-217",
+   "referenced_type" : "type-153",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16144,8 +16210,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-217",
-   "self_type" : "type-253",
+   "referenced_type" : "type-230",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16157,8 +16223,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16187,8 +16253,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16197,8 +16263,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16207,8 +16273,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16217,8 +16283,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-176",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16227,8 +16293,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16237,8 +16303,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16247,8 +16313,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16257,8 +16323,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16267,8 +16333,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16277,8 +16343,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16287,8 +16353,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2017",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16297,8 +16363,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16307,8 +16373,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16317,8 +16383,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16327,8 +16393,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16337,8 +16403,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16347,8 +16413,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16357,8 +16423,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16367,8 +16433,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-405",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16377,8 +16443,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-514",
-   "self_type" : "type-516",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16388,7 +16454,7 @@
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-744",
-   "self_type" : "type-746",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16397,8 +16463,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-853",
+   "referenced_type" : "type-852",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16427,8 +16493,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-197",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16444,32 +16510,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2133",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2071",
-   "self_type" : "type-2070",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16485,7 +16551,7 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-519",
+   "referenced_type" : "type-516",
    "self_type" : "type-639",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -16494,32 +16560,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16527,8 +16593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-518",
-   "self_type" : "type-536",
+   "referenced_type" : "type-515",
+   "self_type" : "type-534",
    "size" : 184,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16548,7 +16614,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-982",
-   "self_type" : "type-1034",
+   "self_type" : "type-1031",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16577,8 +16643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1400",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16587,8 +16653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16597,8 +16663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16607,8 +16673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16627,8 +16693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1433",
    "size" : 128,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16637,8 +16703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-355",
-   "self_type" : "type-363",
+   "referenced_type" : "type-352",
+   "self_type" : "type-360",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16647,8 +16713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-333",
-   "self_type" : "type-346",
+   "referenced_type" : "type-330",
+   "self_type" : "type-343",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16657,8 +16723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16667,8 +16733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2229",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16677,8 +16743,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16707,8 +16773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-830",
+   "self_type" : "type-829",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16717,8 +16783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-527",
-   "self_type" : "type-625",
+   "referenced_type" : "type-524",
+   "self_type" : "type-626",
    "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16727,8 +16793,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-543",
-   "self_type" : "type-720",
+   "referenced_type" : "type-540",
+   "self_type" : "type-721",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16737,7 +16803,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-681",
    "self_type" : "type-706",
    "size" : 64,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16747,8 +16813,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-529",
-   "self_type" : "type-615",
+   "referenced_type" : "type-526",
+   "self_type" : "type-616",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16757,7 +16823,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-973",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -16767,8 +16833,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16778,7 +16844,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16827,7 +16893,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-171",
+   "referenced_type" : "type-174",
    "self_type" : "type-1078",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16837,8 +16903,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16847,7 +16913,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-710",
+   "referenced_type" : "type-711",
    "self_type" : "type-713",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
@@ -16857,8 +16923,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-178",
-   "self_type" : "type-183",
+   "referenced_type" : "type-180",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16867,8 +16933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-287",
-   "self_type" : "type-876",
+   "referenced_type" : "type-284",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16877,8 +16943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2387",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16887,8 +16953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long>",
    "name" : "const android::Vector<long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1430",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16897,8 +16963,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-236",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-238",
+   "self_type" : "type-1427",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16918,7 +16984,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-904",
-   "self_type" : "type-928",
+   "self_type" : "type-920",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16927,8 +16993,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2434",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16937,8 +17003,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-340",
-   "self_type" : "type-406",
+   "referenced_type" : "type-336",
+   "self_type" : "type-403",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16947,8 +17013,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-415",
-   "self_type" : "type-434",
+   "referenced_type" : "type-411",
+   "self_type" : "type-431",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16967,7 +17033,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16987,7 +17053,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-68",
    "self_type" : "type-1373",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17007,8 +17073,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-176",
+   "referenced_type" : "type-52",
+   "self_type" : "type-171",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17017,8 +17083,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-327",
+   "referenced_type" : "type-203",
+   "self_type" : "type-324",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17028,7 +17094,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17057,8 +17123,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-192",
-   "self_type" : "type-200",
+   "referenced_type" : "type-195",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17067,8 +17133,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-204",
-   "self_type" : "type-232",
+   "referenced_type" : "type-217",
+   "self_type" : "type-234",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17077,8 +17143,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17087,8 +17153,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-402",
+   "referenced_type" : "type-393",
+   "self_type" : "type-399",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17097,8 +17163,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17107,7 +17173,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17127,8 +17193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-295",
+   "referenced_type" : "type-137",
+   "self_type" : "type-292",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17137,8 +17203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-189",
+   "referenced_type" : "type-122",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17147,7 +17213,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17157,8 +17223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17167,8 +17233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17177,8 +17243,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-381",
+   "self_type" : "type-380",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17187,8 +17253,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2005",
-   "self_type" : "type-2004",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17197,8 +17263,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-493",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17207,8 +17273,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-149",
-   "self_type" : "type-152",
+   "referenced_type" : "type-152",
+   "self_type" : "type-155",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17277,8 +17343,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-157",
-   "self_type" : "type-159",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17327,8 +17393,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
+   "referenced_type" : "type-419",
+   "self_type" : "type-421",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17377,8 +17443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17387,8 +17453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17397,8 +17463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17407,8 +17473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17417,8 +17483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17427,8 +17493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17437,8 +17503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17447,8 +17513,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-393",
-   "self_type" : "type-392",
+   "referenced_type" : "type-390",
+   "self_type" : "type-389",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17467,8 +17533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-153",
+   "referenced_type" : "type-151",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17477,8 +17543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-160",
+   "referenced_type" : "type-158",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17487,8 +17553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-425",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17497,7 +17563,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-140",
    "self_type" : "type-1122",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17527,8 +17593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-145",
+   "referenced_type" : "type-136",
+   "self_type" : "type-148",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17537,8 +17603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-130",
+   "self_type" : "type-133",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17557,8 +17623,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-163",
-   "self_type" : "type-164",
+   "referenced_type" : "type-166",
+   "self_type" : "type-167",
    "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"
   },
@@ -17567,8 +17633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17577,8 +17643,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-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
    "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"
   },
@@ -17607,8 +17673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-275",
+   "referenced_type" : "type-252",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17617,8 +17683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17627,8 +17693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-357",
-   "self_type" : "type-381",
+   "referenced_type" : "type-354",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17637,8 +17703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-493",
+   "referenced_type" : "type-482",
+   "self_type" : "type-490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17647,8 +17713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-389",
+   "referenced_type" : "type-331",
+   "self_type" : "type-386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17657,8 +17723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17667,8 +17733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-506",
+   "referenced_type" : "type-496",
+   "self_type" : "type-503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17687,8 +17753,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-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-362",
+   "self_type" : "type-364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17697,8 +17763,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-373",
-   "self_type" : "type-376",
+   "referenced_type" : "type-370",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17717,8 +17783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2440",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17727,8 +17793,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2448",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17738,7 +17804,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-372",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17747,8 +17813,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17757,8 +17823,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-183",
+   "self_type" : "type-182",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17767,8 +17833,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-45",
-   "self_type" : "type-854",
+   "referenced_type" : "type-44",
+   "self_type" : "type-851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17778,7 +17844,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-564",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17794,8 +17860,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17810,8 +17876,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17819,8 +17885,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-581",
-   "self_type" : "type-585",
+   "referenced_type" : "type-578",
+   "self_type" : "type-582",
    "size" : 344,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17829,8 +17895,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-550",
-   "self_type" : "type-556",
+   "referenced_type" : "type-547",
+   "self_type" : "type-553",
    "size" : 248,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17839,8 +17905,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-563",
+   "referenced_type" : "type-105",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17856,120 +17922,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-128",
+   "self_type" : "type-127",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2343",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-39",
+   "self_type" : "type-38",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-410",
+   "self_type" : "type-409",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17984,16 +18050,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-855",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18027,7 +18093,7 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-286",
+   "referenced_type" : "type-12",
    "self_type" : "type-848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18037,8 +18103,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18047,8 +18113,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-141",
-   "self_type" : "type-696",
+   "referenced_type" : "type-143",
+   "self_type" : "type-699",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18058,7 +18124,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-603",
-   "self_type" : "type-826",
+   "self_type" : "type-825",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18087,8 +18153,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18097,8 +18163,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18117,8 +18183,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18127,8 +18193,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18137,8 +18203,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18147,8 +18213,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1957",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18157,8 +18223,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18167,8 +18233,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18177,8 +18243,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18187,8 +18253,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18197,8 +18263,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2348",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18207,8 +18273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18217,8 +18283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-300",
+   "self_type" : "type-299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18227,8 +18293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18247,8 +18313,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18257,8 +18323,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-867",
-   "self_type" : "type-866",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18267,8 +18333,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-923",
-   "self_type" : "type-922",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18307,8 +18373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18317,8 +18383,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18327,8 +18393,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18337,8 +18403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18347,8 +18413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18357,8 +18423,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18367,8 +18433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2263",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18377,8 +18443,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18387,8 +18453,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2354",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18397,8 +18463,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18407,8 +18473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18417,8 +18483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18427,8 +18493,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18437,8 +18503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18447,8 +18513,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-874",
+   "self_type" : "type-873",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18457,8 +18523,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
+   "referenced_type" : "type-931",
+   "self_type" : "type-930",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18467,8 +18533,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18487,8 +18553,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18497,8 +18563,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18507,8 +18573,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18517,8 +18583,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1967",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18527,8 +18593,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18537,8 +18603,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18547,8 +18613,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18557,8 +18623,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18567,8 +18633,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2356",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18577,8 +18643,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18587,8 +18653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18597,8 +18663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18607,8 +18673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18627,8 +18693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18637,8 +18703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18667,8 +18733,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18677,8 +18743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18687,8 +18753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18697,8 +18763,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1962",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18707,8 +18773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18717,8 +18783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18727,8 +18793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2261",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18737,8 +18803,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18747,8 +18813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2352",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18757,8 +18823,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18767,8 +18833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18777,8 +18843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18787,8 +18853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-658",
+   "self_type" : "type-657",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18797,8 +18863,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18807,8 +18873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18817,8 +18883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18827,8 +18893,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18847,8 +18913,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18857,8 +18923,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18867,8 +18933,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18877,8 +18943,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1969",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18887,8 +18953,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18897,8 +18963,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18907,8 +18973,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18917,8 +18983,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18927,8 +18993,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2358",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18937,8 +19003,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2523",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18947,8 +19013,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
+   "referenced_type" : "type-311",
+   "self_type" : "type-310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18957,8 +19023,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-451",
+   "self_type" : "type-450",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18987,8 +19053,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18997,8 +19063,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
+   "referenced_type" : "type-935",
+   "self_type" : "type-934",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19017,8 +19083,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19027,8 +19093,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19037,8 +19103,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19047,8 +19113,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1954",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19057,8 +19123,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19067,8 +19133,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19077,8 +19143,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19087,8 +19153,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19097,8 +19163,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19107,8 +19173,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19117,8 +19183,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19127,8 +19193,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19137,8 +19203,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19157,8 +19223,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-864",
-   "self_type" : "type-863",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19167,8 +19233,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-922",
+   "self_type" : "type-921",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19197,8 +19263,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19207,8 +19273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19217,8 +19283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19227,8 +19293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19237,8 +19303,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19247,8 +19313,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2190",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19257,8 +19323,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19267,8 +19333,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2299",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19277,8 +19343,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2350",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19287,8 +19353,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19297,8 +19363,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19307,8 +19373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19327,8 +19393,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19337,8 +19403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-868",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19347,8 +19413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19367,8 +19433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1012",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19387,8 +19453,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19397,8 +19463,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19407,8 +19473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19417,8 +19483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1974",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19427,8 +19493,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19437,8 +19503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19447,8 +19513,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2271",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19457,8 +19523,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2311",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19467,8 +19533,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19477,8 +19543,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19487,8 +19553,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19497,8 +19563,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19507,8 +19573,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19517,8 +19583,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19527,8 +19593,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-884",
+   "self_type" : "type-883",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19537,8 +19603,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19547,8 +19613,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1016",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19567,8 +19633,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1705",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19577,8 +19643,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19587,8 +19653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19597,8 +19663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1978",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19607,8 +19673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19617,8 +19683,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2208",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19627,8 +19693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19637,8 +19703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2315",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19647,8 +19713,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19657,8 +19723,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19667,8 +19733,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19677,8 +19743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19687,8 +19753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19697,8 +19763,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19707,8 +19773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19717,8 +19783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19727,8 +19793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1014",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19747,8 +19813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1703",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19757,8 +19823,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19767,8 +19833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19777,8 +19843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1977",
+   "self_type" : "type-1976",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19787,8 +19853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19797,8 +19863,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19807,8 +19873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19817,8 +19883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2313",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19827,8 +19893,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19837,8 +19903,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19847,8 +19913,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19857,8 +19923,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19877,8 +19943,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19887,8 +19953,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19897,8 +19963,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19907,8 +19973,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19927,8 +19993,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19937,8 +20003,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19947,8 +20013,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19957,8 +20023,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19967,8 +20033,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19977,8 +20043,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2202",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19987,8 +20053,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2269",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19997,8 +20063,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20007,8 +20073,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20017,8 +20083,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20027,8 +20093,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20037,8 +20103,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-455",
+   "referenced_type" : "type-453",
+   "self_type" : "type-452",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20047,8 +20113,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20067,8 +20133,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20077,8 +20143,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20087,8 +20153,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20107,8 +20173,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1707",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20117,8 +20183,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20127,8 +20193,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20137,8 +20203,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20147,8 +20213,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20157,8 +20223,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20167,8 +20233,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2277",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20177,8 +20243,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2317",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20187,8 +20253,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20197,8 +20263,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20207,8 +20273,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20217,8 +20283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-463",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20227,8 +20293,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20247,8 +20313,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20257,8 +20323,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-946",
-   "self_type" : "type-945",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20267,8 +20333,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20287,8 +20353,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20297,8 +20363,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20307,8 +20373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2220",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20317,8 +20383,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2285",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20327,8 +20393,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2325",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20337,8 +20403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20347,8 +20413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20357,8 +20423,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-473",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20367,8 +20433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20377,8 +20443,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20387,8 +20453,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-954",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20417,8 +20483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20427,8 +20493,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20437,8 +20503,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2218",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20447,8 +20513,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2283",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20457,8 +20523,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2323",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20467,8 +20533,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20477,8 +20543,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20487,8 +20553,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20497,8 +20563,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-792",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20507,8 +20573,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-897",
-   "self_type" : "type-896",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20517,8 +20583,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-953",
-   "self_type" : "type-952",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20547,8 +20613,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20557,8 +20623,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20567,8 +20633,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2216",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20577,8 +20643,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2281",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20587,8 +20653,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2320",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2321",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20597,8 +20663,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20607,8 +20673,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20617,8 +20683,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-470",
-   "self_type" : "type-469",
+   "referenced_type" : "type-467",
+   "self_type" : "type-466",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20627,8 +20693,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20637,8 +20703,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20647,8 +20713,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20677,8 +20743,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20687,8 +20753,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20697,8 +20763,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2214",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20707,8 +20773,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2279",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20717,8 +20783,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20727,8 +20793,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20737,8 +20803,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20747,8 +20813,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20767,8 +20833,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20777,8 +20843,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-949",
+   "self_type" : "type-948",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20787,8 +20853,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20807,8 +20873,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20817,8 +20883,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20827,8 +20893,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20837,8 +20903,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2287",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20847,8 +20913,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2327",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20857,8 +20923,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20867,8 +20933,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2551",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20877,8 +20943,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20887,8 +20953,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-796",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20897,8 +20963,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20907,8 +20973,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20917,8 +20983,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20927,8 +20993,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20937,8 +21003,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20947,8 +21013,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1943",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20957,8 +21023,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20967,8 +21033,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20977,8 +21043,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20987,8 +21053,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-425",
+   "self_type" : "type-424",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20997,8 +21063,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21007,8 +21073,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21027,8 +21093,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1008",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21037,8 +21103,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21047,8 +21113,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21057,8 +21123,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1757",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21067,8 +21133,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21077,46 +21143,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2404",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-771",
-   "self_type" : "type-770",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2407",
    "self_type" : "type-2406",
    "size" : 4,
@@ -21125,10 +21151,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-859",
-   "self_type" : "type-858",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-856",
+   "self_type" : "type-855",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21147,8 +21213,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21157,8 +21223,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2225",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21167,8 +21233,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21177,8 +21243,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21187,8 +21253,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2668",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21197,8 +21263,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2333",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21217,8 +21283,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21237,8 +21303,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21247,8 +21313,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21257,8 +21323,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21267,8 +21333,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21277,8 +21343,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21287,8 +21353,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1994",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21297,8 +21363,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21307,8 +21373,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2153",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21317,8 +21383,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2235",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21327,8 +21393,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2330",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21337,8 +21403,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21347,8 +21413,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21357,8 +21423,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-330",
-   "self_type" : "type-329",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21367,8 +21433,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21377,8 +21443,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21397,8 +21463,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21407,8 +21473,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-833",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21417,8 +21483,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21427,8 +21493,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-207",
-   "self_type" : "type-214",
+   "referenced_type" : "type-220",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21437,8 +21503,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-237",
+   "referenced_type" : "type-125",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21447,8 +21513,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-238",
+   "referenced_type" : "type-126",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21457,8 +21523,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-209",
-   "self_type" : "type-216",
+   "referenced_type" : "type-222",
+   "self_type" : "type-229",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -21476,7 +21542,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-150",
+   "referenced_type" : "type-153",
    "self_type" : "type-1119",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21485,8 +21551,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned long const[3]",
    "name" : "unsigned long const[3]",
-   "referenced_type" : "type-944",
-   "self_type" : "type-951",
+   "referenced_type" : "type-936",
+   "self_type" : "type-945",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21496,7 +21562,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-272",
+   "self_type" : "type-268",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21505,8 +21571,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-277",
+   "referenced_type" : "type-105",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21519,48 +21585,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21571,23 +21637,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21598,18 +21664,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-507"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21620,63 +21686,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "width",
      "field_offset" : 448,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 480,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 512,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 544,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 576,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 640,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 704,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-522"
     },
     {
      "field_name" : "handle",
      "field_offset" : 768,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "usage",
      "field_offset" : 832,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 896,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21687,22 +21753,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21719,7 +21785,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "alloc",
@@ -21739,7 +21805,7 @@
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1152,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "alloc_device_t",
@@ -21755,20 +21821,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 184,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-519", "type-527", "type-171", "type-520" ],
+   "template_args" : [ "type-516", "type-524", "type-174", "type-517" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21963,14 +22029,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-257"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -22011,13 +22077,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22029,14 +22095,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 448,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22046,14 +22112,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22063,13 +22129,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22081,20 +22147,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 320,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1404"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 88,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22106,20 +22172,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1407",
    "size" : 80,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22141,11 +22207,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22153,11 +22219,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-524" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22209,36 +22275,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 704,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 128,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22248,7 +22314,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-358"
     }
    ],
    "fields" :
@@ -22257,20 +22323,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 64,
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 128,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22307,7 +22373,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     }
    ],
    "fields" :
@@ -22316,20 +22382,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 64,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22387,10 +22453,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-534"
+     "referenced_type" : "type-531"
     }
    ],
    "fields" :
@@ -22399,62 +22465,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 1472,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 1536,
-     "referenced_type" : "type-528"
+     "referenced_type" : "type-525"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 1600,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 1664,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 1696,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1728,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1824,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1856,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22494,81 +22560,81 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-542"
+     "referenced_type" : "type-539"
     }
    ],
    "fields" :
    [
     {
-     "access" : "private",
+     "access" : "protected",
      "field_name" : "mMapper",
-     "referenced_type" : "type-528"
+     "referenced_type" : "type-525"
     },
     {
-     "access" : "private",
+     "access" : "protected",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-541"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator",
    "name" : "android::GraphicBufferAllocator",
    "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 192,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "size",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "requestorName",
      "field_offset" : 320,
-     "referenced_type" : "type-678"
+     "referenced_type" : "type-682"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
@@ -22578,7 +22644,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-529"
     }
    ],
    "fields" :
@@ -22586,20 +22652,20 @@
     {
      "access" : "private",
      "field_name" : "mMapper",
-     "referenced_type" : "type-530"
+     "referenced_type" : "type-527"
     },
     {
      "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 64,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-528"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22609,7 +22675,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-961"
     }
    ],
    "fields" :
@@ -22617,7 +22683,7 @@
     {
      "access" : "private",
      "field_name" : "mSupportedHdrTypes",
-     "referenced_type" : "type-961"
+     "referenced_type" : "type-963"
     },
     {
      "access" : "private",
@@ -22641,8 +22707,8 @@
    "linker_set_key" : "android::HdrCapabilities",
    "name" : "android::HdrCapabilities",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h",
    "unique_id" : "_ZTSN7android15HdrCapabilitiesE"
@@ -22654,17 +22720,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "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-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-178", "type-250" ],
+   "template_args" : [ "type-180", "type-252" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22674,17 +22740,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22692,11 +22758,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22704,11 +22770,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrCapabilities>",
    "name" : "android::LightFlattenable<android::HdrCapabilities>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-960" ],
+   "template_args" : [ "type-962" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_15HdrCapabilitiesEEE"
   },
   {
@@ -22740,11 +22806,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2390" ],
+   "template_args" : [ "type-2392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22850,14 +22916,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22869,14 +22935,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-1378"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22925,12 +22991,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22949,14 +23015,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-261"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22968,14 +23034,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-264"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22987,14 +23053,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-264"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23027,14 +23093,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23074,8 +23140,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23121,7 +23187,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
    "fields" :
@@ -23129,14 +23195,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2385"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23148,7 +23214,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23165,11 +23231,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-543" ],
+   "template_args" : [ "type-540" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23177,11 +23243,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-529" ],
+   "template_args" : [ "type-526" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23190,17 +23256,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "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-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23248,14 +23314,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "record_kind" : "class",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
    "template_args" : [ "type-694" ],
@@ -23305,14 +23371,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23370,14 +23436,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23389,14 +23455,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23407,7 +23473,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -23416,62 +23482,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-256"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-366"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23561,14 +23627,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2385",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23616,17 +23682,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-248" ],
+   "template_args" : [ "type-250" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23671,17 +23737,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23726,17 +23792,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-243" ],
+   "template_args" : [ "type-245" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23781,17 +23847,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23836,17 +23902,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<long>",
    "name" : "android::Vector<long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIlEE",
    "vtable_components" :
    [
@@ -23893,32 +23959,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -24004,11 +24070,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24028,7 +24094,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24093,28 +24159,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2412"
+     "referenced_type" : "type-2414"
+    },
+    {
+     "referenced_type" : "type-2415"
     },
     {
      "referenced_type" : "type-2413"
     },
     {
-     "referenced_type" : "type-2411"
-    },
-    {
-     "referenced_type" : "type-2419"
-    },
-    {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2421"
     },
     {
      "referenced_type" : "type-2422"
     },
     {
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
-     "referenced_type" : "type-2424"
+     "referenced_type" : "type-2423"
+    },
+    {
+     "referenced_type" : "type-2426"
     }
    ],
    "fields" :
@@ -24122,14 +24188,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24152,8 +24218,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24176,8 +24242,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24200,8 +24266,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24224,8 +24290,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24248,8 +24314,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24260,11 +24326,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24272,8 +24338,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24284,11 +24350,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24296,8 +24362,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24308,11 +24374,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24320,8 +24386,8 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24332,38 +24398,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-339"
     },
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-341"
     },
     {
-     "referenced_type" : "type-44"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-337"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24371,27 +24437,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-338"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24402,29 +24468,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24434,35 +24500,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-414"
     },
     {
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-39"
-    },
-    {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-41"
     },
     {
      "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-412"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24473,11 +24539,11 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-413"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xyz",
@@ -24492,8 +24558,8 @@
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24525,8 +24591,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24536,22 +24602,22 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-391"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-456"
     },
     {
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-509"
     },
     {
      "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-644"
     }
    ],
    "fields" :
@@ -24668,44 +24734,11 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-62"
     },
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    }
-   ],
-   "fields" :
-   [
-    {
      "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "android::details::TVec2<double>",
-   "name" : "android::details::TVec2<double>",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-45" ],
-   "unique_id" : "_ZTSN7android7details5TVec2IdEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
+    },
     {
      "referenced_type" : "type-64"
     },
@@ -24714,14 +24747,47 @@
     },
     {
      "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::details::TVec2<double>",
+   "name" : "android::details::TVec2<double>",
+   "record_kind" : "class",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
+   "template_args" : [ "type-44" ],
+   "unique_id" : "_ZTSN7android7details5TVec2IdEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24732,19 +24798,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24755,19 +24821,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24778,19 +24844,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24932,44 +24998,11 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-73"
     },
     {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-80"
-    },
-    {
-     "referenced_type" : "type-81"
-    },
-    {
-     "referenced_type" : "type-82"
-    },
-    {
-     "referenced_type" : "type-83"
-    }
-   ],
-   "fields" :
-   [
-    {
      "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::details::TVec3<double>",
-   "name" : "android::details::TVec3<double>",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-45" ],
-   "unique_id" : "_ZTSN7android7details5TVec3IdEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
+    },
     {
      "referenced_type" : "type-75"
     },
@@ -24980,24 +25013,57 @@
      "referenced_type" : "type-77"
     },
     {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "android::details::TVec3<double>",
+   "name" : "android::details::TVec3<double>",
+   "record_kind" : "class",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
+   "template_args" : [ "type-44" ],
+   "unique_id" : "_ZTSN7android7details5TVec3IdEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-70"
+    },
+    {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -25008,24 +25074,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25036,24 +25102,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25064,24 +25130,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25097,13 +25163,13 @@
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-18"
     },
     {
      "referenced_type" : "type-37"
@@ -25250,38 +25316,38 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-79"
+    },
+    {
+     "referenced_type" : "type-80"
+    },
+    {
+     "referenced_type" : "type-81"
+    },
+    {
+     "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
      "referenced_type" : "type-84"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-86"
-    },
-    {
-     "referenced_type" : "type-87"
-    },
-    {
-     "referenced_type" : "type-88"
-    },
-    {
-     "referenced_type" : "type-89"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25289,45 +25355,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-54"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-56"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25338,29 +25404,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25371,29 +25437,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25404,29 +25470,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25436,35 +25502,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-224"
+     "referenced_type" : "type-209"
     },
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-213"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25475,13 +25541,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-205"
     },
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-207"
     },
     {
      "field_name" : "xy",
@@ -25512,8 +25578,8 @@
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25545,8 +25611,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25578,8 +25644,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25611,8 +25677,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25634,8 +25700,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25646,11 +25712,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25658,8 +25724,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25670,8 +25736,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25682,11 +25748,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25706,11 +25772,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25730,11 +25796,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25742,8 +25808,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25766,8 +25832,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25778,11 +25844,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25790,8 +25856,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25802,8 +25868,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25814,11 +25880,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25838,11 +25904,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25850,8 +25916,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25862,11 +25928,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25874,8 +25940,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25886,8 +25952,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "name" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25898,11 +25964,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25922,11 +25988,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25946,11 +26012,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25958,8 +26024,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25982,11 +26048,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -26006,11 +26072,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26018,8 +26084,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26030,11 +26096,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26042,8 +26108,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26054,8 +26120,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26066,11 +26132,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26090,11 +26156,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26114,11 +26180,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26126,8 +26192,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26150,8 +26216,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26162,11 +26228,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26174,8 +26240,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26186,8 +26252,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26198,11 +26264,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26222,11 +26288,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26234,8 +26300,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26246,11 +26312,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26258,8 +26324,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26325,7 +26391,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26347,7 +26413,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26356,32 +26422,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 192,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26488,7 +26554,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -26497,26 +26563,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-196"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-199"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26605,22 +26671,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26641,7 +26707,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26729,14 +26795,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26846,14 +26912,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26934,14 +27000,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27023,85 +27089,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-244"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 384,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 704,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 1024,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 1344,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 2432,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 3520,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 3552,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 3584,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 3648,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 3680,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 3712,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 3776,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
@@ -27119,26 +27185,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 3904,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-289"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 4096,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-290"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 4160,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 528,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27150,73 +27216,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 384,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 448,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 576,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 640,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 704,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 768,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 832,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -27240,20 +27306,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-223"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 1024,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27265,23 +27331,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-222"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-222"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27292,7 +27358,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -27301,55 +27367,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-281"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 896,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 960,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 1024,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 1088,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
@@ -27361,25 +27427,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 1856,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-249"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 2240,
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-284"
     },
     {
      "access" : "private",
@@ -27397,26 +27463,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2336,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 2368,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27494,18 +27560,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-197"
     },
     {
      "field_name" : "refs",
      "field_offset" : 64,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-243",
+   "self_type" : "type-243",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27515,7 +27581,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27524,17 +27590,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27542,7 +27608,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27551,17 +27617,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-396" ],
+   "template_args" : [ "type-395" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27569,7 +27635,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27578,17 +27644,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27596,7 +27662,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27606,7 +27672,7 @@
    "self_type" : "type-1321",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27616,26 +27682,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27741,7 +27807,7 @@
    "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLm10EJEEE"
   },
   {
@@ -27755,12 +27821,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1100",
    "self_type" : "type-1100",
@@ -27792,16 +27858,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-138" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27819,7 +27885,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-289" ],
+   "template_args" : [ "type-286" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27829,16 +27895,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1072",
    "self_type" : "type-1072",
@@ -27852,16 +27918,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27871,19 +27937,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27895,19 +27961,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_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<hidl_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<hidl_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<hidl_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-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27927,7 +27993,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27941,12 +28007,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1151",
    "self_type" : "type-1151",
@@ -27960,16 +28026,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27979,19 +28045,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned 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<unsigned 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<unsigned 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-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -28013,7 +28079,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28025,8 +28091,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28039,7 +28105,7 @@
    "self_type" : "type-1103",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLm10EJEEE"
   },
   {
@@ -28053,7 +28119,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28080,7 +28146,7 @@
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLm10EJEEE"
   },
   {
@@ -28089,7 +28155,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28174,33 +28240,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-149", "type-150" ],
+   "template_args" : [ "type-152", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-157", "type-150" ],
+   "template_args" : [ "type-159", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-422", "type-150" ],
+   "template_args" : [ "type-419", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28210,7 +28276,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -28221,8 +28287,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28234,13 +28300,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-140"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28270,7 +28336,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28300,7 +28366,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28325,13 +28391,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28342,11 +28408,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-138" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28356,13 +28422,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28373,11 +28439,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28410,23 +28476,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-166"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "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"
@@ -28437,13 +28503,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28552,13 +28618,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "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",
@@ -28672,12 +28738,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28686,7 +28752,7 @@
    "self_type" : "type-694",
    "size" : 72,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28716,17 +28782,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-524" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28736,17 +28802,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-371" ],
+   "template_args" : [ "type-368" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28756,17 +28822,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-288",
+   "self_type" : "type-288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-244" ],
+   "template_args" : [ "type-246" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28776,17 +28842,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-197"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-198" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28796,17 +28862,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-283" ],
+   "template_args" : [ "type-279" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28816,17 +28882,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-357" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28836,17 +28902,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-483"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-488" ],
+   "template_args" : [ "type-485" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28856,17 +28922,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-337" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28876,17 +28942,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28896,17 +28962,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-501" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28936,17 +29002,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-363"
     }
    ],
    "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-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-173" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28956,36 +29022,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-371"
     }
    ],
    "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-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-297" ],
+   "template_args" : [ "type-294" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28995,8 +29061,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29006,22 +29072,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long>",
    "name" : "android::trait_pointer<long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIlEE"
   },
   {
@@ -29032,7 +29098,7 @@
    "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29061,8 +29127,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29072,8 +29138,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29083,11 +29149,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29098,26 +29164,26 @@
    "self_type" : "type-812",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-790",
+   "self_type" : "type-790",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-756",
+   "self_type" : "type-756",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29127,11 +29193,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "referenced_type" : "type-649",
+   "self_type" : "type-649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29142,18 +29208,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
@@ -29171,22 +29237,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29197,18 +29263,18 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "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-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
@@ -29226,11 +29292,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29241,7 +29307,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29281,8 +29347,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29292,11 +29358,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29307,18 +29373,18 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29336,33 +29402,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29380,52 +29446,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29435,11 +29501,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29450,7 +29516,7 @@
    "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29490,8 +29556,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29501,11 +29567,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29516,7 +29582,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29527,7 +29593,7 @@
    "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29545,41 +29611,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-615",
+   "self_type" : "type-615",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-603" ],
@@ -29589,52 +29655,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29644,22 +29710,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29688,11 +29754,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-178" ],
+   "template_args" : [ "type-180" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29703,15 +29769,15 @@
    "self_type" : "type-903",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29721,8 +29787,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29732,22 +29798,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29758,7 +29824,7 @@
    "self_type" : "type-799",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29776,11 +29842,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29791,7 +29857,7 @@
    "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
@@ -29802,15 +29868,15 @@
    "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-603" ],
@@ -29824,18 +29890,18 @@
    "self_type" : "type-600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29846,18 +29912,18 @@
    "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
@@ -29875,11 +29941,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -29890,15 +29956,15 @@
    "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29908,8 +29974,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-821",
-   "self_type" : "type-821",
+   "referenced_type" : "type-822",
+   "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29919,22 +29985,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<const native_handle *>",
    "name" : "android::traits<const native_handle *>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long>",
    "name" : "android::traits<long>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIlEE"
   },
   {
@@ -29943,12 +30009,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29966,20 +30032,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29996,8 +30062,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30007,13 +30073,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30024,13 +30090,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30041,16 +30107,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long>",
    "name" : "android::use_trivial_move<long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIlEE"
   },
   {
@@ -30081,12 +30147,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     },
     {
      "field_name" : "xyzc_points",
@@ -30113,7 +30179,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30135,7 +30201,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30145,32 +30211,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30187,33 +30253,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 320,
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-519"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 384,
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-519"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30224,28 +30290,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30320,43 +30386,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30367,108 +30433,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "flags",
      "field_offset" : 960,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "width",
      "field_offset" : 992,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "height",
      "field_offset" : 1024,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "stride",
      "field_offset" : 1056,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "format",
      "field_offset" : 1088,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 1120,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 1152,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "fps",
      "field_offset" : 1184,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 1216,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 1248,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 1280,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 1312,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1536,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1600,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-566"
     },
     {
      "field_name" : "post",
      "field_offset" : 1664,
-     "referenced_type" : "type-571"
+     "referenced_type" : "type-568"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1728,
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-570"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1792,
-     "referenced_type" : "type-575"
+     "referenced_type" : "type-572"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1856,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1920,
-     "referenced_type" : "type-578"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 288,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30479,63 +30545,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1984,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 2048,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "lock",
      "field_offset" : 2112,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 2176,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "perform",
      "field_offset" : 2240,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 2304,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 2368,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 2432,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-591"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 2496,
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-594"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 2560,
+     "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "validateBufferSize",
+     "field_offset" : 2624,
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "reserved_proc",
-     "field_offset" : 2560,
-     "referenced_type" : "type-599"
+     "field_offset" : 2688,
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 344,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30546,33 +30622,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 128,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     },
     {
      "field_name" : "close",
      "field_offset" : 896,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-558"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-545",
+   "self_type" : "type-545",
    "size" : 120,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30583,13 +30659,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-550"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-549",
+   "self_type" : "type-549",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30600,7 +30676,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30615,38 +30691,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "name",
      "field_offset" : 128,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "author",
      "field_offset" : 192,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "methods",
      "field_offset" : 256,
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-548"
     },
     {
      "field_name" : "dso",
      "field_offset" : 320,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-547",
+   "self_type" : "type-547",
    "size" : 248,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30712,12 +30788,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30744,22 +30820,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30791,27 +30867,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30843,27 +30919,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30895,32 +30971,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30942,28 +31018,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30973,13 +31049,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-432",
+   "self_type" : "type-432",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30990,8 +31066,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -31004,8 +31080,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31013,7 +31089,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities &&",
    "name" : "android::HdrCapabilities &&",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-971",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -31031,8 +31107,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31040,8 +31116,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-394",
-   "self_type" : "type-400",
+   "referenced_type" : "type-393",
+   "self_type" : "type-397",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31049,8 +31125,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31067,7 +31143,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1311",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31076,7 +31152,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1316",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31085,7 +31161,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-140",
    "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31104,7 +31180,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1358",
-   "self_type" : "type-1411",
+   "self_type" : "type-1415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31112,8 +31188,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-357",
-   "self_type" : "type-380",
+   "referenced_type" : "type-354",
+   "self_type" : "type-377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31121,8 +31197,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-485",
-   "self_type" : "type-492",
+   "referenced_type" : "type-482",
+   "self_type" : "type-489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31130,8 +31206,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-334",
-   "self_type" : "type-388",
+   "referenced_type" : "type-331",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31139,8 +31215,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-53",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31148,8 +31224,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-498",
-   "self_type" : "type-505",
+   "referenced_type" : "type-496",
+   "self_type" : "type-502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31157,7 +31233,7 @@
    "alignment" : 8,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/arm_armv7-a-neon/source-based/libui.so.lsdump b/29/64/arm_armv7-a-neon/source-based/libui.so.lsdump
index 20c7f22..517f12f 100644
--- a/29/64/arm_armv7-a-neon/source-based/libui.so.lsdump
+++ b/29/64/arm_armv7-a-neon/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2279",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -178,8 +169,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -188,16 +179,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -213,8 +204,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -222,16 +213,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -239,8 +230,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -267,8 +258,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -277,8 +268,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -297,8 +288,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -314,8 +305,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1661,12 +1652,18 @@
    "name" : "__aeabi_memset8"
   },
   {
+   "name" : "__aeabi_uidiv"
+  },
+  {
    "name" : "__aeabi_uidivmod"
   },
   {
    "name" : "__udivmodsi4"
   },
   {
+   "name" : "__udivsi3"
+  },
+  {
    "name" : "android_convertGralloc0To1Usage"
   },
   {
@@ -1848,11 +1845,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -2014,11 +2011,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -2036,11 +2033,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2066,7 +2063,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2088,11 +2085,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2115,11 +2112,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2145,11 +2142,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2167,11 +2164,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2185,11 +2182,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2203,11 +2200,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2225,7 +2222,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2239,11 +2236,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2257,11 +2254,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2275,11 +2272,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2297,7 +2294,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2315,7 +2312,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2333,7 +2330,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2351,7 +2348,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2365,11 +2362,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2383,11 +2380,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2401,11 +2398,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2420,11 +2417,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2450,7 +2447,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2472,7 +2469,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2494,11 +2491,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2552,7 +2549,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2606,7 +2603,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2708,11 +2705,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2766,7 +2763,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2808,7 +2805,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3050,7 +3047,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3076,7 +3073,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3170,7 +3167,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3204,7 +3201,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3314,11 +3311,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3384,7 +3381,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3642,7 +3639,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3764,7 +3761,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3794,7 +3791,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3908,11 +3905,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3982,7 +3979,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4256,7 +4253,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4286,7 +4283,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4412,7 +4409,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4434,11 +4431,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "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-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4476,11 +4473,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4510,11 +4507,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4564,7 +4561,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4618,7 +4615,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4644,7 +4641,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4686,7 +4683,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4928,7 +4925,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4958,7 +4955,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4988,7 +4985,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -5030,7 +5027,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5068,7 +5065,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5094,7 +5091,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5112,7 +5109,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5142,7 +5139,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5236,7 +5233,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5278,7 +5275,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5296,7 +5293,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5326,7 +5323,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5360,7 +5357,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5414,7 +5411,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5427,18 +5424,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5451,11 +5448,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5469,26 +5466,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5499,15 +5496,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5517,18 +5514,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5538,33 +5535,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5574,36 +5571,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5613,33 +5610,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5649,36 +5646,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5688,15 +5742,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5706,18 +5760,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5727,12 +5781,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5742,15 +5796,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5760,15 +5814,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5778,24 +5832,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5805,12 +5859,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5820,12 +5874,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5838,14 +5892,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5856,27 +5910,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5886,12 +5940,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5901,18 +5955,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5927,7 +5981,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5939,7 +5993,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5951,7 +6005,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5963,7 +6017,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5975,7 +6029,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5984,10 +6038,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5999,7 +6053,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6011,7 +6065,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6023,7 +6077,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6110,7 +6164,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6119,7 +6173,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6129,10 +6183,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6141,14 +6195,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6158,10 +6212,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6171,18 +6225,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6192,10 +6246,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6208,10 +6262,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6221,23 +6275,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6247,28 +6301,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6278,23 +6332,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6304,10 +6358,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6316,14 +6370,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6333,10 +6387,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6346,18 +6400,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6367,10 +6421,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6383,10 +6437,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6396,23 +6450,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6422,28 +6476,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6453,23 +6507,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6479,16 +6533,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6497,10 +6551,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6510,10 +6564,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6523,13 +6577,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6539,25 +6593,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6568,10 +6622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6581,13 +6635,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6598,28 +6652,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6630,34 +6684,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6667,19 +6721,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6689,22 +6743,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6714,16 +6768,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6733,22 +6787,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6761,10 +6815,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,10 +6827,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6788,13 +6842,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6806,7 +6860,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6816,24 +6870,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6897,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,10 +6927,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6886,27 +6940,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6916,30 +6970,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6949,33 +7003,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6985,16 +7039,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7004,19 +7058,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7026,7 +7080,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -7041,7 +7095,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7051,34 +7105,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7088,26 +7142,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7117,25 +7171,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7144,7 +7198,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7154,29 +7208,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7186,10 +7240,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7199,34 +7253,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7236,26 +7290,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7265,25 +7319,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7292,7 +7346,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7302,29 +7356,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7334,10 +7388,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7348,10 +7402,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7362,10 +7416,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7376,10 +7430,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7388,16 +7442,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7407,10 +7461,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7420,10 +7474,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7439,10 +7493,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7458,7 +7512,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7474,7 +7528,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7487,7 +7541,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7500,7 +7554,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7526,13 +7580,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7542,13 +7596,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7567,7 +7621,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7586,7 +7640,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7596,16 +7650,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7616,10 +7670,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7629,13 +7683,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7645,19 +7699,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7667,28 +7721,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7698,16 +7752,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7717,34 +7771,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7754,25 +7808,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7782,19 +7836,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7804,30 +7858,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7837,13 +7891,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7853,33 +7907,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7889,36 +7943,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7928,22 +7982,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7954,10 +8008,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7968,10 +8022,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7980,16 +8034,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2300"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7999,13 +8053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8015,93 +8069,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8114,7 +8168,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8127,7 +8181,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8137,7 +8191,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8146,7 +8200,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8156,7 +8210,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8171,7 +8225,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8181,10 +8235,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8193,7 +8247,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8203,10 +8257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8242,13 +8296,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8258,13 +8312,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8274,10 +8328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8287,13 +8341,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8303,13 +8357,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8319,10 +8373,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8332,10 +8386,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8345,10 +8399,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8358,13 +8412,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2292",
+   "return_type" : "type-2294",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8377,7 +8431,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8390,16 +8444,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8415,10 +8469,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8434,10 +8488,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8453,10 +8507,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8469,10 +8523,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8481,7 +8535,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8499,7 +8553,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8533,7 +8587,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8549,7 +8603,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8562,10 +8616,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8581,7 +8635,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8594,10 +8648,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8607,13 +8661,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8623,13 +8677,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,19 +8693,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8662,16 +8716,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8682,22 +8736,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8708,16 +8762,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8727,16 +8781,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8746,10 +8800,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8759,22 +8813,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8784,19 +8838,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8806,25 +8860,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8834,19 +8888,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8856,25 +8910,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8883,10 +8937,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8896,13 +8950,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8912,16 +8966,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8931,16 +8985,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8950,10 +9004,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8963,13 +9017,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8979,13 +9033,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8995,19 +9049,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9017,13 +9071,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9033,13 +9087,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9049,19 +9103,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9071,13 +9125,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9087,13 +9141,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9103,19 +9157,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9125,10 +9179,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9145,7 +9199,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-10"
@@ -9154,7 +9208,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9164,19 +9218,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9186,16 +9240,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9205,16 +9259,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9224,13 +9278,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9240,13 +9294,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9256,10 +9310,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9269,13 +9323,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9285,13 +9339,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9301,10 +9355,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9314,10 +9368,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9327,10 +9381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9340,13 +9394,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9356,10 +9410,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9369,13 +9423,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9385,13 +9439,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9401,7 +9455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9416,7 +9470,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9426,13 +9480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9442,13 +9496,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9458,13 +9512,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9474,13 +9528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9490,13 +9544,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9506,13 +9560,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9523,7 +9577,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9532,7 +9586,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9542,13 +9596,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9558,13 +9612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9574,13 +9628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9591,7 +9645,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9600,7 +9654,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9610,25 +9664,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9638,7 +9692,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9651,10 +9705,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9664,16 +9718,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9693,7 +9747,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9707,13 +9761,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,13 +9781,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9747,16 +9801,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9770,16 +9824,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9793,16 +9847,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9816,16 +9870,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9835,10 +9889,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9848,28 +9902,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9879,7 +9933,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9892,10 +9946,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9905,7 +9959,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9918,7 +9972,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9933,7 +9987,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9943,10 +9997,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9956,13 +10010,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9972,28 +10026,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10003,16 +10057,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10022,16 +10076,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10041,19 +10095,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10063,31 +10117,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10098,13 +10152,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10114,25 +10168,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10142,31 +10196,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10176,13 +10230,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10192,7 +10246,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10205,10 +10259,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10218,16 +10272,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10237,10 +10291,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10250,34 +10304,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10287,7 +10341,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10300,10 +10354,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10313,13 +10367,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10329,13 +10383,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10348,7 +10402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-6",
@@ -10361,10 +10415,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10374,7 +10428,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10387,7 +10441,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10400,7 +10454,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10413,7 +10467,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10426,13 +10480,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10442,16 +10496,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
-    },
-    {
      "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2295"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10462,10 +10516,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10475,10 +10529,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10488,10 +10542,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10501,10 +10555,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2276",
+   "return_type" : "type-2278",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10514,7 +10568,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1246"
@@ -10534,13 +10588,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10550,13 +10604,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10566,13 +10620,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10582,7 +10636,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1280"
@@ -10598,16 +10652,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10617,10 +10671,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10633,13 +10687,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10687,13 +10741,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10757,7 +10811,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10770,7 +10824,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10783,7 +10837,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10796,7 +10850,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10821,7 +10875,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10831,13 +10885,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10847,13 +10901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10863,19 +10917,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10885,10 +10939,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10898,10 +10952,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
    "return_type" : "type-6",
@@ -10914,7 +10968,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10927,17 +10981,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10947,20 +11001,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2228"
+     "referenced_type" : "type-2231"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10970,7 +11024,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10983,13 +11037,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10999,13 +11053,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11015,19 +11069,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11037,16 +11091,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11056,7 +11110,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1284"
@@ -11072,13 +11126,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11091,10 +11145,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11107,13 +11161,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11123,13 +11177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11139,19 +11193,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11161,13 +11215,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11177,13 +11231,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,19 +11247,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11216,16 +11270,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11236,22 +11290,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11262,16 +11316,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11281,16 +11335,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11301,16 +11355,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,16 +11375,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11341,19 +11395,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11364,19 +11418,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11387,19 +11441,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11410,19 +11464,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11432,10 +11486,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11445,10 +11499,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11458,7 +11512,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11471,10 +11525,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11484,10 +11538,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11497,7 +11551,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11512,24 +11566,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11565,41 +11619,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2220",
+   "referenced_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11609,8 +11663,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11618,8 +11672,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11627,8 +11681,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11636,8 +11690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11654,8 +11708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11672,8 +11726,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11690,8 +11744,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11699,8 +11753,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11708,8 +11762,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11717,8 +11771,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11735,8 +11789,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11744,8 +11798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11753,8 +11807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11771,7 +11825,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11780,7 +11834,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11789,7 +11843,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11798,7 +11852,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11807,8 +11861,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11816,8 +11870,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11825,8 +11879,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11834,8 +11888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11843,8 +11897,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11861,7 +11915,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11870,8 +11924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11879,8 +11933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11888,8 +11942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11897,8 +11951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11906,8 +11960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2841",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11915,8 +11969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2917",
-   "self_type" : "type-2916",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2919",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11924,8 +11978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11933,8 +11987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11951,8 +12005,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11970,7 +12024,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11978,8 +12032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11987,8 +12041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11996,8 +12050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12005,8 +12059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12014,8 +12068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12023,8 +12077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12047,78 +12101,78 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2204",
+   "referenced_type" : "type-2206",
    "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2254",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2742",
+   "self_type" : "type-2744",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
    "referenced_type" : "type-3102",
-   "self_type" : "type-3134",
+   "self_type" : "type-3137",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-3368",
-   "self_type" : "type-3370",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2139",
+   "referenced_type" : "type-2138",
    "self_type" : "type-2149",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2733",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2735",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3024",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3383",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12134,7 +12188,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12143,8 +12197,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12152,8 +12206,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12170,8 +12224,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12179,8 +12233,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12188,8 +12242,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12197,8 +12251,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12206,17 +12260,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3028",
-   "self_type" : "type-3027",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3030",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12233,6 +12278,15 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GrallocMapper &",
+   "name" : "const android::GrallocMapper &",
    "referenced_type" : "type-612",
    "self_type" : "type-611",
    "size" : 4,
@@ -12242,8 +12296,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12251,8 +12305,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12261,7 +12315,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12269,8 +12323,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12296,8 +12350,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12305,8 +12359,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12314,8 +12368,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12323,8 +12377,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12332,8 +12386,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12341,8 +12395,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12350,8 +12404,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12359,8 +12413,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12413,8 +12467,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12422,8 +12476,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12431,8 +12485,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12494,8 +12548,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12513,7 +12567,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12530,8 +12584,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12539,8 +12593,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12566,8 +12620,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12575,7 +12629,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12584,7 +12638,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12593,7 +12647,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12608,44 +12662,44 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2266",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3178",
-   "self_type" : "type-3190",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3191",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3373",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3376",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12668,169 +12722,169 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2096",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2098",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2552",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2588",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2759",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2816",
-   "self_type" : "type-2818",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2837",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2839",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2907",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3053",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3146",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3216",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3221",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3258",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-3261",
+   "self_type" : "type-3263",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3312",
+   "self_type" : "type-3314",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3419",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12843,15 +12897,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12890,8 +12944,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12899,8 +12953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12909,7 +12963,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12926,8 +12980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12935,8 +12989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2737",
-   "self_type" : "type-2739",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12944,8 +12998,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12953,8 +13007,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12962,8 +13016,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-2182",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12971,8 +13025,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-2734",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2736",
+   "self_type" : "type-2738",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12980,8 +13034,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-3072",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12998,8 +13052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13007,8 +13061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2746",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2748",
+   "self_type" : "type-2750",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13016,7 +13070,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3191",
+   "referenced_type" : "type-3194",
    "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -13025,8 +13079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13034,8 +13088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2513",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13043,8 +13097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2810",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13052,8 +13106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13061,8 +13115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13070,8 +13124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3301",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13088,8 +13142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13106,8 +13160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13115,8 +13169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13124,8 +13178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13133,8 +13187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13142,8 +13196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13151,8 +13205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2022",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13160,8 +13214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13169,8 +13223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13178,8 +13232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13187,8 +13241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13196,8 +13250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13205,8 +13259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2796",
+   "self_type" : "type-2795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13214,8 +13268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13223,8 +13277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2873",
+   "self_type" : "type-2872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13232,8 +13286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2963",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13241,8 +13295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3042",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13250,8 +13304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3118",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13259,8 +13313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13268,8 +13322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13277,8 +13331,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3296",
-   "self_type" : "type-3295",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13286,8 +13340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3346",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13295,8 +13349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3512",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13304,8 +13358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13313,8 +13367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13331,8 +13385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13340,8 +13394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13349,8 +13403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13358,8 +13412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13367,8 +13421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13376,7 +13430,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13386,7 +13440,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13412,7 +13466,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13421,7 +13475,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13430,8 +13484,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13439,8 +13493,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13448,8 +13502,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13457,8 +13511,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2721",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13466,8 +13520,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13475,8 +13529,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13484,8 +13538,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13493,8 +13547,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-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13502,8 +13556,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-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13511,8 +13565,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-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13520,8 +13574,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-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13529,8 +13583,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-3116",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13538,8 +13592,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-3360",
-   "self_type" : "type-3359",
+   "referenced_type" : "type-3363",
+   "self_type" : "type-3362",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13547,8 +13601,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13556,8 +13610,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-3397",
-   "self_type" : "type-3396",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13574,7 +13628,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13583,7 +13637,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13592,7 +13646,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13604,8 +13658,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13613,8 +13667,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3034",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13622,8 +13676,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13631,7 +13685,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13658,8 +13712,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13667,8 +13721,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13676,8 +13730,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13685,8 +13739,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13694,8 +13748,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13703,8 +13757,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13721,8 +13775,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13730,8 +13784,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13739,8 +13793,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13748,8 +13802,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2797",
-   "self_type" : "type-2796",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13757,8 +13811,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2812",
-   "self_type" : "type-2811",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13766,8 +13820,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3571",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13775,8 +13829,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3626",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13793,8 +13847,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13803,7 +13857,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13820,8 +13874,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13838,8 +13892,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13847,8 +13901,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13856,8 +13910,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13865,8 +13919,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13883,8 +13937,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13892,8 +13946,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13901,8 +13955,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13910,8 +13964,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13919,8 +13973,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13928,8 +13982,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13946,8 +14000,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13955,8 +14009,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13964,8 +14018,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13973,8 +14027,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2842",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13982,8 +14036,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13991,8 +14045,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2921",
-   "self_type" : "type-2920",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14000,8 +14054,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14009,8 +14063,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14019,7 +14073,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2233",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14036,8 +14090,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14045,8 +14099,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14063,8 +14117,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14072,8 +14126,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14081,8 +14135,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14099,8 +14153,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14108,8 +14162,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14135,8 +14189,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14144,8 +14198,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14153,8 +14207,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14162,8 +14216,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14171,8 +14225,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14180,8 +14234,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14189,8 +14243,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14198,8 +14252,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14207,8 +14261,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14216,8 +14270,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14225,8 +14279,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14234,8 +14288,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14243,8 +14297,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14252,8 +14306,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14261,8 +14315,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14270,8 +14324,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14279,8 +14333,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-2801",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14288,8 +14342,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14297,8 +14351,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2813",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14306,8 +14360,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2833",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14315,8 +14369,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2899",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14324,8 +14378,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2983",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14333,8 +14387,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14342,8 +14396,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3214",
-   "self_type" : "type-3213",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14351,8 +14405,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3256",
-   "self_type" : "type-3255",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14360,8 +14414,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14369,8 +14423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3405",
-   "self_type" : "type-3404",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14378,8 +14432,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14387,8 +14441,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14396,8 +14450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14405,8 +14459,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14414,8 +14468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14423,8 +14477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14450,8 +14504,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -14468,8 +14522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14495,8 +14549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14504,8 +14558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14513,8 +14567,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14522,8 +14576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14531,8 +14585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14567,8 +14621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14577,7 +14631,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14585,8 +14639,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14594,8 +14648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14603,8 +14657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14621,7 +14675,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14630,7 +14684,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14639,7 +14693,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14648,8 +14702,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14657,8 +14711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14666,8 +14720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14675,7 +14729,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14684,7 +14738,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14693,7 +14747,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14702,7 +14756,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14712,7 +14766,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14738,8 +14792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14756,8 +14810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14765,8 +14819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14774,8 +14828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14783,8 +14837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14792,8 +14846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14801,8 +14855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14819,7 +14873,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14846,8 +14900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14855,7 +14909,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14864,8 +14918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14873,8 +14927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14882,8 +14936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14891,8 +14945,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14900,8 +14954,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2696",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-2698",
+   "self_type" : "type-2697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14909,8 +14963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14918,8 +14972,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3083",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14927,8 +14981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14936,8 +14990,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3204",
-   "self_type" : "type-3203",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14945,8 +14999,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14954,8 +15008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14972,8 +15026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14981,8 +15035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14990,8 +15044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14999,8 +15053,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15008,8 +15062,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15017,8 +15071,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3133",
+   "self_type" : "type-3132",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15026,8 +15080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3210",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15035,8 +15089,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15044,8 +15098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15053,8 +15107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15062,8 +15116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15071,8 +15125,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15080,8 +15134,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15089,8 +15143,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15098,8 +15152,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15107,8 +15161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2886",
+   "self_type" : "type-2885",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15116,8 +15170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3087",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15125,8 +15179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-3128",
+   "self_type" : "type-3127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15134,8 +15188,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3205",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15143,8 +15197,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15179,8 +15233,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15188,8 +15242,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15197,8 +15251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15206,8 +15260,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15215,8 +15269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15224,8 +15278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15233,8 +15287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15242,8 +15296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3127",
-   "self_type" : "type-3126",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15251,8 +15305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3208",
-   "self_type" : "type-3207",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15287,8 +15341,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15296,8 +15350,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15305,8 +15359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15314,8 +15368,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2875",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15323,8 +15377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15332,8 +15386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15341,8 +15395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15350,8 +15404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15359,8 +15413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2976",
-   "self_type" : "type-2975",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15368,8 +15422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15377,8 +15431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3211",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15386,8 +15440,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15404,8 +15458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15431,8 +15485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15449,8 +15503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15467,8 +15521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15476,8 +15530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15486,7 +15540,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15503,8 +15557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15512,8 +15566,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15521,8 +15575,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15530,8 +15584,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15539,8 +15593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15548,8 +15602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15557,8 +15611,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-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15575,8 +15629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15584,8 +15638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2299",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15602,8 +15656,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -15611,8 +15665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15620,8 +15674,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-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -15630,7 +15684,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15638,8 +15692,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15647,8 +15701,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15656,8 +15710,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3040",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3043",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15674,7 +15728,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -15683,8 +15737,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15719,8 +15773,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15728,8 +15782,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15746,8 +15800,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15755,8 +15809,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15764,8 +15818,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15773,8 +15827,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15782,8 +15836,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15791,8 +15845,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15800,8 +15854,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15809,8 +15863,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15818,8 +15872,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15872,8 +15926,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2229",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15890,8 +15944,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15899,8 +15953,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15908,8 +15962,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15917,8 +15971,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15926,8 +15980,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15944,7 +15998,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15972,7 +16026,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15980,8 +16034,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -16007,8 +16061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16016,8 +16070,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16025,8 +16079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16034,8 +16088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16061,8 +16115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16070,8 +16124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16088,8 +16142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16097,8 +16151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2713",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16106,8 +16160,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2879",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16115,8 +16169,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16124,8 +16178,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16133,8 +16187,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2972",
-   "self_type" : "type-2974",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16142,8 +16196,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16151,8 +16205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16160,8 +16214,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16169,8 +16223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16178,8 +16232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16187,8 +16241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16196,8 +16250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2824",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16205,8 +16259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16214,8 +16268,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16223,8 +16277,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16232,8 +16286,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16241,8 +16295,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16250,8 +16304,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16259,8 +16313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16268,8 +16322,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16286,8 +16340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16295,8 +16349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16304,8 +16358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16322,8 +16376,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16331,8 +16385,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16349,8 +16403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "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/IBase.h"
   },
@@ -16358,8 +16412,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16368,7 +16422,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16385,8 +16439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16394,8 +16448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16403,8 +16457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16412,8 +16466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16421,8 +16475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16439,8 +16493,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-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16448,8 +16502,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-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16466,8 +16520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16475,8 +16529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16484,8 +16538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16493,8 +16547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16502,8 +16556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16511,8 +16565,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16520,7 +16574,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -16539,7 +16593,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16547,8 +16601,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16556,8 +16610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16565,8 +16619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16574,7 +16628,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16583,8 +16637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16601,8 +16655,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16610,8 +16664,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16619,8 +16673,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16628,8 +16682,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16637,8 +16691,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16664,8 +16718,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16673,42 +16727,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -16716,8 +16734,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -16725,10 +16743,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16736,8 +16808,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16745,8 +16817,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16754,8 +16826,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16763,8 +16835,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16772,8 +16844,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16781,8 +16853,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16790,8 +16862,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16808,8 +16880,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16817,7 +16889,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16826,8 +16898,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16835,8 +16907,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16844,8 +16916,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16862,8 +16934,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-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16871,8 +16943,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16880,8 +16952,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16889,8 +16961,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16898,8 +16970,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16911,8 +16983,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16941,8 +17013,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16951,8 +17023,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16961,8 +17033,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16971,8 +17043,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16981,8 +17053,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16991,8 +17063,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17001,8 +17073,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17011,8 +17083,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17021,8 +17093,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17031,8 +17103,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17041,8 +17113,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17051,8 +17123,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17061,8 +17133,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17071,8 +17143,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17081,8 +17153,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17091,8 +17163,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2751",
-   "self_type" : "type-2753",
+   "referenced_type" : "type-2753",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17101,8 +17173,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2798",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17111,8 +17183,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2803",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17121,8 +17193,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2815",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2817",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17131,8 +17203,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17141,8 +17213,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2900",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17151,8 +17223,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17161,8 +17233,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17171,8 +17243,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17181,8 +17253,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3255",
-   "self_type" : "type-3257",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17191,8 +17263,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3306",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17201,8 +17273,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17211,8 +17283,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3570",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17221,8 +17293,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17231,8 +17303,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17241,8 +17313,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17251,8 +17323,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17261,8 +17333,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17291,8 +17363,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17308,24 +17380,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17340,24 +17412,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17373,8 +17445,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -17382,48 +17454,48 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2732",
-   "self_type" : "type-2731",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3015",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3378",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3381",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17431,8 +17503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -17452,7 +17524,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17481,8 +17553,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17491,8 +17563,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17501,8 +17573,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17511,8 +17583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17531,8 +17603,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -17541,8 +17613,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17551,8 +17623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17561,8 +17633,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17571,8 +17643,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17581,8 +17653,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17591,18 +17663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3195",
-   "self_type" : "type-3194",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17621,6 +17683,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GrallocMapper",
+   "name" : "const android::GrallocMapper",
    "referenced_type" : "type-613",
    "self_type" : "type-612",
    "size" : 4,
@@ -17631,8 +17703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17641,8 +17713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17651,8 +17723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -17661,8 +17733,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -17671,7 +17743,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -17681,8 +17753,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17692,7 +17764,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -17701,8 +17773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -17712,7 +17784,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2231",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17761,7 +17833,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -17771,8 +17843,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17791,8 +17863,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17801,8 +17873,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17811,8 +17883,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17821,8 +17893,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17831,8 +17903,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17852,7 +17924,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -17861,8 +17933,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2283",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17871,8 +17943,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17881,8 +17953,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17901,7 +17973,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -17911,7 +17983,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17921,7 +17993,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17931,7 +18003,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17941,8 +18013,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17951,8 +18023,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17962,7 +18034,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17991,8 +18063,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -18001,8 +18073,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -18011,8 +18083,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18021,8 +18093,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18031,8 +18103,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18041,7 +18113,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18061,8 +18133,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18071,8 +18143,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18081,7 +18153,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18091,8 +18163,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18101,8 +18173,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2716",
+   "self_type" : "type-2715",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18111,8 +18183,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18121,8 +18193,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18131,8 +18203,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18141,8 +18213,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18151,8 +18223,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18161,8 +18233,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18231,8 +18303,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -18281,8 +18353,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -18331,8 +18403,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18341,8 +18413,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18351,8 +18423,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18361,8 +18433,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18371,8 +18443,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18381,8 +18453,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18391,8 +18463,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2830",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18401,8 +18473,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18411,8 +18483,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18421,8 +18493,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18431,8 +18503,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18451,8 +18523,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18461,8 +18533,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18471,8 +18543,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18481,7 +18553,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -18511,8 +18583,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18521,8 +18593,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18541,8 +18613,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-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "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"
   },
@@ -18551,8 +18623,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -18561,8 +18633,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-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "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"
   },
@@ -18591,8 +18663,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -18601,8 +18673,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -18611,8 +18683,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18621,8 +18693,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18631,8 +18703,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18641,8 +18713,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18651,8 +18723,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18671,8 +18743,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-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18681,8 +18753,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-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18701,8 +18773,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2289",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18711,8 +18783,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2297",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18722,7 +18794,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18731,8 +18803,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -18741,8 +18813,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18751,8 +18823,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18762,7 +18834,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -18778,40 +18850,40 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3372",
-   "self_type" : "type-3371",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18819,8 +18891,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -18829,8 +18901,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -18839,8 +18911,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18856,192 +18928,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2586",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2836",
-   "self_type" : "type-2835",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2905",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3310",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19056,16 +19128,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19099,7 +19171,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -19109,8 +19181,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19119,8 +19191,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19130,7 +19202,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19159,8 +19231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19169,8 +19241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19179,8 +19251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3089",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19199,8 +19271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19209,8 +19281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19219,8 +19291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19229,8 +19301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19239,8 +19311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19249,8 +19321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19259,8 +19331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2162",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19269,8 +19341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19279,8 +19351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2656",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19289,8 +19361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19299,8 +19371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2849",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19309,8 +19381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19319,8 +19391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19329,8 +19401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19339,8 +19411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3154",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19349,8 +19421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3223",
+   "referenced_type" : "type-3227",
+   "self_type" : "type-3226",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19359,8 +19431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3264",
-   "self_type" : "type-3263",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19369,8 +19441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3315",
-   "self_type" : "type-3314",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19379,8 +19451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19389,8 +19461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19409,8 +19481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19419,8 +19491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19429,8 +19501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19449,8 +19521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19469,8 +19541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19479,8 +19551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19489,8 +19561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19499,8 +19571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19509,8 +19581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19519,8 +19591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19529,8 +19601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19539,8 +19611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19549,8 +19621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19559,8 +19631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19569,8 +19641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2854",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19579,8 +19651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19589,8 +19661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19599,8 +19671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19609,8 +19681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3161",
-   "self_type" : "type-3160",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19619,8 +19691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3230",
-   "self_type" : "type-3229",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19629,8 +19701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-3273",
+   "self_type" : "type-3272",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19639,8 +19711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3320",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3323",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19649,8 +19721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19659,8 +19731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19669,8 +19741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19689,8 +19761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19699,8 +19771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19709,8 +19781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19729,8 +19801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19739,8 +19811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19749,8 +19821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19759,8 +19831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19769,8 +19841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19779,8 +19851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19789,8 +19861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19799,8 +19871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19809,8 +19881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19819,8 +19891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19829,8 +19901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2857",
-   "self_type" : "type-2856",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19839,8 +19911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19849,8 +19921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19859,8 +19931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19869,8 +19941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3163",
-   "self_type" : "type-3162",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19879,8 +19951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3232",
-   "self_type" : "type-3231",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19889,8 +19961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19899,8 +19971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3323",
-   "self_type" : "type-3322",
+   "referenced_type" : "type-3326",
+   "self_type" : "type-3325",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19909,8 +19981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3465",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19919,8 +19991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19929,8 +20001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19949,8 +20021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19959,8 +20031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19979,8 +20051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19989,8 +20061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1790",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19999,8 +20071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20009,8 +20081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20019,8 +20091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20029,8 +20101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20039,8 +20111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20049,8 +20121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20059,8 +20131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20069,8 +20141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2765",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20079,8 +20151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20089,8 +20161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20099,8 +20171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3060",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20109,8 +20181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20119,8 +20191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3157",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20129,8 +20201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3228",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20139,8 +20211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3267",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20149,8 +20221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3319",
-   "self_type" : "type-3318",
+   "referenced_type" : "type-3322",
+   "self_type" : "type-3321",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20159,8 +20231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20169,8 +20241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20179,8 +20251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20189,8 +20261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20199,8 +20271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20209,8 +20281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20229,8 +20301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20249,8 +20321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20259,8 +20331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20269,8 +20341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20279,8 +20351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20289,8 +20361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20299,8 +20371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20309,8 +20381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20319,8 +20391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20329,8 +20401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20339,8 +20411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2772",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20349,8 +20421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20359,8 +20431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2936",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20369,8 +20441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3071",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20379,8 +20451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20389,8 +20461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3165",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20399,8 +20471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3234",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20409,8 +20481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3274",
-   "self_type" : "type-3273",
+   "referenced_type" : "type-3277",
+   "self_type" : "type-3276",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20419,8 +20491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20429,8 +20501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3467",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3470",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20439,8 +20511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20469,8 +20541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20479,8 +20551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20499,8 +20571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20509,8 +20581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1784",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20519,8 +20591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20529,8 +20601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20539,8 +20611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20549,8 +20621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20559,8 +20631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20569,8 +20641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20579,8 +20651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20589,8 +20661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2760",
-   "self_type" : "type-2759",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20599,8 +20671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20609,8 +20681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20619,8 +20691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20629,8 +20701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3056",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20639,8 +20711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20649,8 +20721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20659,8 +20731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20669,8 +20741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3313",
-   "self_type" : "type-3312",
+   "referenced_type" : "type-3316",
+   "self_type" : "type-3315",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20679,8 +20751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20689,8 +20761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20699,8 +20771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20719,8 +20791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20729,8 +20801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20759,8 +20831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20769,8 +20841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20779,8 +20851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20789,8 +20861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20799,8 +20871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20809,8 +20881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20819,8 +20891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20829,8 +20901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20839,8 +20911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20849,8 +20921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2763",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20859,8 +20931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2851",
-   "self_type" : "type-2850",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20869,8 +20941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2927",
-   "self_type" : "type-2926",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20879,8 +20951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20889,8 +20961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20899,8 +20971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20909,8 +20981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3226",
-   "self_type" : "type-3225",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20919,8 +20991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3265",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20929,8 +21001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3316",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20939,8 +21011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20949,8 +21021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20969,8 +21041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20979,8 +21051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20989,8 +21061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -21009,8 +21081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21029,8 +21101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21039,8 +21111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21049,8 +21121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21059,8 +21131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21069,8 +21141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21079,8 +21151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21089,8 +21161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21099,8 +21171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21109,8 +21181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21119,8 +21191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21129,8 +21201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2863",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21139,8 +21211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2943",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21149,8 +21221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21159,8 +21231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3170",
-   "self_type" : "type-3169",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21169,8 +21241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21179,8 +21251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3238",
-   "self_type" : "type-3237",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21189,8 +21261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3278",
-   "self_type" : "type-3277",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21199,8 +21271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3329",
-   "self_type" : "type-3328",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3331",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21209,8 +21281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21219,8 +21291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21229,8 +21301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21239,8 +21311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21249,8 +21321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21259,8 +21331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21269,8 +21341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21289,8 +21361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21299,8 +21371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21309,8 +21381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21319,8 +21391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21329,8 +21401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21339,8 +21411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21349,8 +21421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21359,8 +21431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21369,8 +21441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21379,8 +21451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2779",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21389,8 +21461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21399,8 +21471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21409,8 +21481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3077",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21419,8 +21491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3175",
-   "self_type" : "type-3174",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21429,8 +21501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21439,8 +21511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21449,8 +21521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3282",
-   "self_type" : "type-3281",
+   "referenced_type" : "type-3285",
+   "self_type" : "type-3284",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21459,8 +21531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21469,8 +21541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21479,8 +21551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21489,8 +21561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21509,8 +21581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21519,8 +21591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21529,8 +21601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21549,8 +21621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21559,8 +21631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1802",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21569,8 +21641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21579,8 +21651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21589,8 +21661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21599,8 +21671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21609,8 +21681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21619,8 +21691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21629,8 +21701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21639,8 +21711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2778",
-   "self_type" : "type-2777",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21649,8 +21721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21659,8 +21731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2945",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21669,8 +21741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21679,8 +21751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21689,8 +21761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21699,8 +21771,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3240",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21709,8 +21781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3280",
-   "self_type" : "type-3279",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3282",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21719,8 +21791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
+   "referenced_type" : "type-3334",
+   "self_type" : "type-3333",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21729,8 +21801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21739,8 +21811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21759,8 +21831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21769,8 +21841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21779,8 +21851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21789,8 +21861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21809,8 +21881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21819,8 +21891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21829,8 +21901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21839,8 +21911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1990",
+   "self_type" : "type-1989",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21849,8 +21921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2070",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21859,8 +21931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21869,8 +21941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21879,8 +21951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21889,8 +21961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2668",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21899,8 +21971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21909,8 +21981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21919,8 +21991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21929,8 +22001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3073",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21939,8 +22011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21949,8 +22021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21959,8 +22031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3236",
-   "self_type" : "type-3235",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21969,8 +22041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3276",
-   "self_type" : "type-3275",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21979,8 +22051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3326",
+   "referenced_type" : "type-3330",
+   "self_type" : "type-3329",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21989,8 +22061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21999,8 +22071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22009,8 +22081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22019,8 +22091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22029,8 +22101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22039,8 +22111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22069,8 +22141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22079,8 +22151,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1806",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22089,8 +22161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22099,8 +22171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22109,8 +22181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22119,8 +22191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22129,8 +22201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22139,8 +22211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22149,8 +22221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22159,8 +22231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2782",
-   "self_type" : "type-2781",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22169,8 +22241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22179,8 +22251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22189,8 +22261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3079",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22199,8 +22271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3177",
-   "self_type" : "type-3176",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22209,8 +22281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22219,8 +22291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22229,8 +22301,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3284",
-   "self_type" : "type-3283",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3286",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22239,8 +22311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3335",
-   "self_type" : "type-3334",
+   "referenced_type" : "type-3338",
+   "self_type" : "type-3337",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22249,8 +22321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22259,8 +22331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22269,8 +22341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22289,8 +22361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22299,8 +22371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22309,8 +22381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22329,8 +22401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22339,8 +22411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22349,8 +22421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2088",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22359,8 +22431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22369,8 +22441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22379,8 +22451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22389,8 +22461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22399,8 +22471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22409,8 +22481,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3187",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22419,8 +22491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22429,8 +22501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3292",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22439,8 +22511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22449,8 +22521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22459,8 +22531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22469,8 +22541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22479,8 +22551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22489,8 +22561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22499,8 +22571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22519,8 +22591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22529,8 +22601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22539,8 +22611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22549,8 +22621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22559,8 +22631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22569,8 +22641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22579,8 +22651,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22589,8 +22661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22599,8 +22671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3185",
-   "self_type" : "type-3184",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22609,8 +22681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22619,8 +22691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3290",
-   "self_type" : "type-3289",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22629,8 +22701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22639,8 +22711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22649,8 +22721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22659,8 +22731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22669,8 +22741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22679,8 +22751,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22689,8 +22761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22709,8 +22781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22719,8 +22791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22729,8 +22801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22739,8 +22811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22749,8 +22821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22759,8 +22831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22769,8 +22841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2786",
-   "self_type" : "type-2785",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22779,8 +22851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22789,8 +22861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22799,8 +22871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22809,8 +22881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3288",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22819,8 +22891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3339",
-   "self_type" : "type-3338",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22829,8 +22901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22839,8 +22911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22849,8 +22921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22859,8 +22931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22869,8 +22941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22899,8 +22971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22909,8 +22981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22919,8 +22991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22929,8 +23001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22939,8 +23011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22949,8 +23021,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22959,8 +23031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2783",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22969,8 +23041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2952",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22979,8 +23051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22989,8 +23061,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22999,8 +23071,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3286",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23009,8 +23081,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3336",
+   "referenced_type" : "type-3340",
+   "self_type" : "type-3339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23019,8 +23091,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23029,8 +23101,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23039,8 +23111,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23049,8 +23121,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23059,8 +23131,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23069,8 +23141,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23089,8 +23161,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23099,8 +23171,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23109,8 +23181,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23119,8 +23191,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23129,8 +23201,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23139,8 +23211,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2400",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23149,8 +23221,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2792",
-   "self_type" : "type-2791",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23159,8 +23231,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23169,8 +23241,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3189",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23179,8 +23251,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23189,8 +23261,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23199,8 +23271,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3345",
-   "self_type" : "type-3344",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23209,8 +23281,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23219,8 +23291,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23239,8 +23311,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23249,8 +23321,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23259,8 +23331,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23269,8 +23341,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23279,8 +23351,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23289,8 +23361,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23299,8 +23371,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23309,8 +23381,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23319,8 +23391,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23329,8 +23401,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2839",
-   "self_type" : "type-2838",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23339,8 +23411,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2912",
-   "self_type" : "type-2911",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23349,8 +23421,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23359,8 +23431,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3148",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23369,8 +23441,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3220",
-   "self_type" : "type-3219",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3222",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23379,8 +23451,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23389,8 +23461,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23399,8 +23471,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23419,8 +23491,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23429,8 +23501,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2176",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23439,8 +23511,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23449,8 +23521,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3072",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3069",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23459,8 +23531,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23469,8 +23541,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23479,8 +23551,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23489,8 +23561,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23499,8 +23571,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23509,8 +23581,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23519,8 +23591,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23529,8 +23601,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23539,8 +23611,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2730",
-   "self_type" : "type-2729",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23549,8 +23621,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23559,8 +23631,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-3367",
-   "self_type" : "type-3366",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23569,8 +23641,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23589,8 +23661,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23599,8 +23671,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2747",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23609,8 +23681,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23619,8 +23691,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23629,8 +23701,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23639,8 +23711,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2808",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23649,8 +23721,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3610",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23659,8 +23731,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23669,8 +23741,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-3300",
-   "self_type" : "type-3299",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23689,8 +23761,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23709,8 +23781,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23719,8 +23791,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23729,8 +23801,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23739,8 +23811,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23749,8 +23821,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23759,8 +23831,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23769,8 +23841,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23779,8 +23851,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23789,8 +23861,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2418",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23799,8 +23871,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23809,8 +23881,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2683",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23819,8 +23891,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2794",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23829,8 +23901,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2821",
-   "self_type" : "type-2820",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23839,8 +23911,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
+   "referenced_type" : "type-2874",
+   "self_type" : "type-2873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23849,8 +23921,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2964",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23859,8 +23931,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3046",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23869,8 +23941,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23879,8 +23951,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3202",
-   "self_type" : "type-3201",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23889,8 +23961,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23899,8 +23971,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23909,8 +23981,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23919,8 +23991,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23929,8 +24001,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23939,8 +24011,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23959,8 +24031,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23969,8 +24041,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23979,8 +24051,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23989,8 +24061,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23999,8 +24071,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -24009,8 +24081,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24028,7 +24100,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24037,8 +24109,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -24048,7 +24120,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -24057,8 +24129,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -24071,48 +24143,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -24123,23 +24195,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -24150,18 +24222,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -24172,63 +24244,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -24239,22 +24311,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -24271,7 +24343,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -24307,20 +24379,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -24408,7 +24480,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -24515,14 +24587,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -24563,13 +24635,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -24581,14 +24653,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -24598,14 +24670,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -24615,13 +24687,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -24633,20 +24705,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -24658,20 +24730,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -24693,11 +24765,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -24705,11 +24777,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -24761,36 +24833,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -24800,7 +24872,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -24809,20 +24881,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -24859,7 +24931,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -24868,20 +24940,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -24939,10 +25011,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -24951,62 +25023,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1024,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1088,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1120,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1152,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -25046,7 +25118,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 192,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 256,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 288,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -25058,100 +25214,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 192,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 256,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 288,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -25206,17 +25278,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "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-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -25232,11 +25304,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -25244,11 +25316,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -25292,11 +25364,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2221" ],
+   "template_args" : [ "type-2224" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25402,14 +25474,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -25421,14 +25493,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -25477,12 +25549,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -25501,14 +25573,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -25520,14 +25592,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -25539,14 +25611,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -25579,14 +25651,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -25626,8 +25698,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -25673,7 +25745,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2222"
+     "referenced_type" : "type-2225"
     }
    ],
    "fields" :
@@ -25681,14 +25753,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -25700,7 +25772,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -25717,11 +25789,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -25729,11 +25801,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -25742,17 +25814,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "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-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -25800,7 +25872,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -25857,14 +25929,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -25922,14 +25994,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -25941,14 +26013,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -25959,7 +26031,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -25968,62 +26040,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -26113,14 +26185,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -26168,17 +26240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -26223,17 +26295,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -26278,17 +26350,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -26333,17 +26405,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -26388,17 +26460,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -26445,32 +26517,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -26556,11 +26628,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -26580,7 +26652,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -26645,28 +26717,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2254"
+     "referenced_type" : "type-2257"
+    },
+    {
+     "referenced_type" : "type-2258"
     },
     {
      "referenced_type" : "type-2255"
     },
     {
-     "referenced_type" : "type-2252"
-    },
-    {
-     "referenced_type" : "type-2265"
-    },
-    {
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2269"
     },
     {
      "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     },
     {
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2271"
+    },
+    {
+     "referenced_type" : "type-2274"
     }
    ],
    "fields" :
@@ -26674,14 +26746,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2279"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26704,8 +26776,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26728,8 +26800,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26752,8 +26824,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26776,8 +26848,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26800,8 +26872,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26812,11 +26884,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -26824,8 +26896,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26836,11 +26908,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -26848,8 +26920,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26860,11 +26932,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26884,38 +26956,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -26923,27 +26995,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -26954,29 +27026,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -26986,35 +27058,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -27025,27 +27097,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -27077,8 +27149,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -27088,16 +27160,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -27220,12 +27292,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -27236,22 +27302,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -27259,21 +27331,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -27284,19 +27356,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -27307,19 +27379,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -27330,19 +27402,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -27352,9 +27424,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -27368,19 +27437,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -27391,21 +27463,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -27427,8 +27499,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -27450,8 +27522,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -27473,8 +27545,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -27484,12 +27556,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -27500,22 +27566,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -27523,33 +27595,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -27560,24 +27632,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -27588,24 +27660,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -27616,24 +27688,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -27643,35 +27715,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -27682,33 +27754,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -27735,8 +27807,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -27763,8 +27835,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -27791,8 +27863,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -27802,12 +27874,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -27818,22 +27884,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -27841,45 +27913,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -27890,29 +27962,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -27923,29 +27995,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -27956,29 +28028,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -27988,35 +28060,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -28027,45 +28099,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -28097,8 +28169,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -28130,8 +28202,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -28163,8 +28235,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -28186,8 +28258,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28198,11 +28270,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28210,8 +28282,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28222,8 +28294,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28234,11 +28306,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28246,8 +28318,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28258,11 +28330,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28270,8 +28342,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28282,11 +28354,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28294,8 +28366,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28318,8 +28390,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28330,11 +28402,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28342,8 +28414,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28354,8 +28426,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28366,11 +28438,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28378,8 +28450,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28390,11 +28462,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28402,8 +28474,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28414,11 +28486,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28426,8 +28498,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28450,11 +28522,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -28462,8 +28534,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28474,11 +28546,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -28486,8 +28558,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28498,11 +28570,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -28510,8 +28582,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28534,11 +28606,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -28546,8 +28618,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28558,11 +28630,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -28570,8 +28642,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28582,11 +28654,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -28594,8 +28666,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28606,8 +28678,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28618,11 +28690,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28630,8 +28702,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28642,11 +28714,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28654,8 +28726,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28666,11 +28738,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28678,8 +28750,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28702,8 +28774,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28714,11 +28786,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28726,8 +28798,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28738,8 +28810,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28750,11 +28822,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28762,8 +28834,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28774,11 +28846,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28798,11 +28870,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28810,8 +28882,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28877,7 +28949,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -28899,7 +28971,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -28908,32 +28980,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -29040,7 +29112,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29049,26 +29121,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -29157,22 +29229,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -29193,7 +29265,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -29281,14 +29353,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -29398,14 +29470,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -29486,14 +29558,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -29575,85 +29647,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -29671,26 +29743,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -29702,73 +29774,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -29792,20 +29864,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -29817,23 +29889,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -29844,7 +29916,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29853,55 +29925,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -29913,25 +29985,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -29949,26 +30021,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -30046,18 +30118,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -30067,7 +30139,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30076,17 +30148,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -30094,7 +30166,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30103,17 +30175,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -30121,7 +30193,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30130,17 +30202,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -30148,7 +30220,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -30158,7 +30230,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -30168,26 +30240,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -30293,7 +30365,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -30307,12 +30379,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1099",
    "self_type" : "type-1099",
@@ -30344,16 +30416,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -30371,7 +30443,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -30381,16 +30453,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1072",
    "self_type" : "type-1072",
@@ -30404,16 +30476,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -30423,19 +30495,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -30447,19 +30519,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_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<hidl_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<hidl_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<hidl_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-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -30479,7 +30551,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -30493,12 +30565,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1151",
    "self_type" : "type-1151",
@@ -30512,16 +30584,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -30531,19 +30603,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned 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<unsigned 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<unsigned 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-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -30565,7 +30637,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30577,8 +30649,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -30591,7 +30663,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -30605,7 +30677,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -30632,7 +30704,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -30641,7 +30713,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -30726,33 +30798,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -30762,7 +30834,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -30773,8 +30845,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30786,13 +30858,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -30822,7 +30894,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30852,7 +30924,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30877,13 +30949,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30894,11 +30966,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -30908,13 +30980,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30925,11 +30997,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -30962,23 +31034,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "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"
@@ -30989,13 +31061,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -31104,13 +31176,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "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",
@@ -31224,12 +31296,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -31238,7 +31310,7 @@
    "self_type" : "type-694",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31268,17 +31340,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -31288,17 +31360,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -31308,17 +31380,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -31328,17 +31400,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -31348,17 +31420,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -31368,17 +31440,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -31388,17 +31460,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -31408,17 +31480,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -31428,17 +31500,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -31448,17 +31520,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -31488,17 +31560,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "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-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -31508,36 +31580,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "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-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -31547,8 +31619,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31558,33 +31630,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31613,8 +31685,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31624,8 +31696,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31635,11 +31707,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -31650,26 +31722,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31679,11 +31751,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -31694,26 +31766,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -31723,22 +31795,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -31749,15 +31821,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -31767,8 +31839,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31778,11 +31850,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -31793,7 +31865,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31833,8 +31905,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31844,11 +31916,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -31859,18 +31931,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -31888,11 +31960,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -31903,18 +31975,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -31932,33 +32004,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -31976,8 +32048,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31987,11 +32059,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -32002,7 +32074,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32042,8 +32114,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32053,11 +32125,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -32068,7 +32140,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -32079,7 +32151,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -32101,18 +32173,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -32123,7 +32195,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -32141,41 +32213,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32185,8 +32257,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32196,22 +32268,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32240,11 +32312,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -32255,15 +32327,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32273,8 +32345,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32284,22 +32356,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -32310,7 +32382,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -32328,11 +32400,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -32343,18 +32415,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -32372,22 +32444,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -32398,15 +32470,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32427,30 +32499,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32460,8 +32532,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32475,18 +32547,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -32495,12 +32567,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -32518,20 +32590,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2284"
+     "referenced_type" : "type-2287"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32548,8 +32620,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32559,13 +32631,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32576,13 +32648,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32593,16 +32665,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -32633,12 +32705,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -32665,7 +32737,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -32687,7 +32759,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -32697,32 +32769,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -32739,33 +32811,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -32776,28 +32848,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -32872,43 +32944,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32919,108 +32991,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -33031,63 +33103,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -33098,33 +33180,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -33135,13 +33217,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -33152,7 +33234,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -33167,38 +33249,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -33264,12 +33346,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -33296,22 +33378,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -33343,27 +33425,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33395,27 +33477,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33447,32 +33529,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33494,28 +33576,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -33525,13 +33607,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33542,8 +33624,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33556,8 +33638,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -33583,8 +33665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33592,8 +33674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33601,8 +33683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33619,7 +33701,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33628,7 +33710,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33637,7 +33719,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -33656,7 +33738,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33664,8 +33746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33673,8 +33755,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33682,8 +33764,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33691,8 +33773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33700,8 +33782,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33709,7 +33791,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/arm_armv8-a/source-based/libui.so.lsdump b/29/64/arm_armv8-a/source-based/libui.so.lsdump
index e0db418..7f50189 100644
--- a/29/64/arm_armv8-a/source-based/libui.so.lsdump
+++ b/29/64/arm_armv8-a/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2279",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -178,8 +169,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -188,16 +179,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -213,8 +204,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -222,16 +213,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 8,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -239,8 +230,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -267,8 +258,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -277,8 +268,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -297,8 +288,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -314,8 +305,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1842,11 +1833,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -2008,11 +1999,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -2030,11 +2021,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2060,7 +2051,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2082,11 +2073,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2109,11 +2100,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2139,11 +2130,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2161,11 +2152,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2179,11 +2170,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2197,11 +2188,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2219,7 +2210,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2233,11 +2224,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2281",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2251,11 +2242,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2269,11 +2260,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2291,7 +2282,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2309,7 +2300,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2327,7 +2318,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2345,7 +2336,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2359,11 +2350,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2377,11 +2368,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2395,11 +2386,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2414,11 +2405,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2444,7 +2435,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2466,7 +2457,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2488,11 +2479,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2546,7 +2537,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2600,7 +2591,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2702,11 +2693,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2760,7 +2751,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2802,7 +2793,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3044,7 +3035,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3070,7 +3061,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3164,7 +3155,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3198,7 +3189,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3308,11 +3299,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3378,7 +3369,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3636,7 +3627,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3758,7 +3749,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3788,7 +3779,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3902,11 +3893,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3976,7 +3967,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4250,7 +4241,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4280,7 +4271,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4406,7 +4397,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4428,11 +4419,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "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-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4470,11 +4461,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2291",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4504,11 +4495,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2292",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4558,7 +4549,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4612,7 +4603,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4638,7 +4629,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4680,7 +4671,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4922,7 +4913,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4952,7 +4943,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4982,7 +4973,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -5024,7 +5015,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5062,7 +5053,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5088,7 +5079,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5106,7 +5097,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5136,7 +5127,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5230,7 +5221,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5272,7 +5263,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5290,7 +5281,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5320,7 +5311,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5354,7 +5345,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5408,7 +5399,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5421,18 +5412,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5445,11 +5436,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5463,26 +5454,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5493,15 +5484,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5511,18 +5502,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5532,33 +5523,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5568,36 +5559,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5607,33 +5598,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5643,36 +5634,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5682,15 +5730,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5700,18 +5748,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5721,12 +5769,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5736,15 +5784,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5754,15 +5802,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5772,24 +5820,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5799,12 +5847,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5814,12 +5862,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5832,14 +5880,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5850,27 +5898,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5880,12 +5928,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5895,18 +5943,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5921,7 +5969,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5933,7 +5981,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5945,7 +5993,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5957,7 +6005,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5969,7 +6017,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5978,10 +6026,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5993,7 +6041,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6005,7 +6053,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6017,7 +6065,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6104,7 +6152,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6113,7 +6161,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6123,10 +6171,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6135,14 +6183,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6152,10 +6200,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6165,18 +6213,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6186,10 +6234,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6202,10 +6250,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6215,23 +6263,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6241,28 +6289,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6272,23 +6320,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6298,10 +6346,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6310,14 +6358,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6327,10 +6375,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6340,18 +6388,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6361,10 +6409,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6377,10 +6425,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6390,23 +6438,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6416,28 +6464,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6447,23 +6495,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6473,16 +6521,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6491,10 +6539,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6504,10 +6552,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6517,13 +6565,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6533,25 +6581,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6562,10 +6610,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6575,13 +6623,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6592,28 +6640,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6624,34 +6672,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6661,19 +6709,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6683,22 +6731,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6708,16 +6756,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6727,22 +6775,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6755,10 +6803,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6767,10 +6815,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6782,13 +6830,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6800,7 +6848,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6810,24 +6858,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6837,27 +6885,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6867,10 +6915,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6880,27 +6928,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6910,30 +6958,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6943,33 +6991,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6979,16 +7027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6998,19 +7046,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7020,7 +7068,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -7035,7 +7083,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7045,34 +7093,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7082,26 +7130,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7111,25 +7159,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7138,7 +7186,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7148,29 +7196,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7180,10 +7228,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7193,34 +7241,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7230,26 +7278,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7259,25 +7307,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7286,7 +7334,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7296,29 +7344,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7328,10 +7376,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7342,10 +7390,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7356,10 +7404,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7370,10 +7418,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7382,16 +7430,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7401,10 +7449,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7414,10 +7462,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7433,10 +7481,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7452,7 +7500,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7468,7 +7516,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7481,7 +7529,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7494,7 +7542,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7520,13 +7568,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7536,13 +7584,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7561,7 +7609,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7580,7 +7628,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7590,16 +7638,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7610,10 +7658,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7623,13 +7671,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7639,19 +7687,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7661,28 +7709,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7692,16 +7740,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7711,34 +7759,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7748,25 +7796,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7776,19 +7824,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7798,30 +7846,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7831,13 +7879,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7847,33 +7895,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7883,36 +7931,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7922,22 +7970,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7948,10 +7996,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7962,10 +8010,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7974,16 +8022,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2298"
+     "referenced_type" : "type-2300"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7993,13 +8041,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8009,93 +8057,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8108,7 +8156,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8121,7 +8169,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8131,7 +8179,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8140,7 +8188,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8150,7 +8198,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
      "referenced_type" : "type-10"
@@ -8165,7 +8213,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8175,10 +8223,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8187,7 +8235,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8197,10 +8245,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8236,13 +8284,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8252,13 +8300,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8268,10 +8316,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8281,13 +8329,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8297,13 +8345,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8313,10 +8361,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8326,10 +8374,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8339,10 +8387,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8352,13 +8400,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2285"
+     "referenced_type" : "type-2288"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2292",
+   "return_type" : "type-2294",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8371,7 +8419,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8384,16 +8432,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8409,10 +8457,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8428,10 +8476,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8447,10 +8495,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8463,10 +8511,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8475,7 +8523,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8493,7 +8541,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8527,7 +8575,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8543,7 +8591,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8556,10 +8604,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8575,7 +8623,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8588,10 +8636,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8601,13 +8649,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8617,13 +8665,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8633,19 +8681,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8656,16 +8704,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8676,22 +8724,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8702,16 +8750,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8721,16 +8769,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8740,10 +8788,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8753,22 +8801,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8778,19 +8826,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8800,25 +8848,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8828,19 +8876,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8850,25 +8898,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8877,10 +8925,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8890,13 +8938,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8906,16 +8954,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8925,16 +8973,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8944,10 +8992,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8957,13 +9005,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8973,13 +9021,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8989,19 +9037,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9011,13 +9059,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9027,13 +9075,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9043,19 +9091,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9065,13 +9113,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9081,13 +9129,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9097,19 +9145,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9119,10 +9167,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9139,7 +9187,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-10"
@@ -9148,7 +9196,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9158,19 +9206,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9180,16 +9228,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2225"
+     "referenced_type" : "type-2228"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9199,16 +9247,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9218,13 +9266,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9234,13 +9282,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9250,10 +9298,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9263,13 +9311,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9279,13 +9327,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9295,10 +9343,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9308,10 +9356,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9321,10 +9369,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9334,13 +9382,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2223"
+     "referenced_type" : "type-2226"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2225",
+   "return_type" : "type-2228",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9350,10 +9398,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9363,13 +9411,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9379,13 +9427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9395,7 +9443,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9410,7 +9458,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9420,13 +9468,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9436,13 +9484,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9452,13 +9500,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9468,13 +9516,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9484,13 +9532,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9500,13 +9548,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9517,7 +9565,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9526,7 +9574,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9536,13 +9584,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9552,13 +9600,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9568,13 +9616,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9585,7 +9633,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9594,7 +9642,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9604,25 +9652,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9632,7 +9680,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9645,10 +9693,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9658,16 +9706,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9687,7 +9735,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9701,13 +9749,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9721,13 +9769,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9741,16 +9789,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9764,16 +9812,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9787,16 +9835,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9810,16 +9858,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9829,10 +9877,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9842,28 +9890,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9873,7 +9921,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9886,10 +9934,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9899,7 +9947,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9912,7 +9960,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9927,7 +9975,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9937,10 +9985,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9950,13 +9998,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9966,28 +10014,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9997,16 +10045,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10016,16 +10064,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10035,19 +10083,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10057,31 +10105,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10092,13 +10140,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10108,25 +10156,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10136,31 +10184,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10170,13 +10218,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10186,7 +10234,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10199,10 +10247,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10212,16 +10260,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10231,10 +10279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10244,34 +10292,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10281,7 +10329,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10294,10 +10342,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10307,13 +10355,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10323,13 +10371,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10342,7 +10390,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-6",
@@ -10355,10 +10403,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10368,7 +10416,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10381,7 +10429,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10394,7 +10442,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10407,7 +10455,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
    "return_type" : "type-10",
@@ -10420,13 +10468,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10436,16 +10484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
-    },
-    {
      "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2295"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10456,10 +10504,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10469,10 +10517,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10482,10 +10530,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10495,10 +10543,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     }
    ],
-   "return_type" : "type-2276",
+   "return_type" : "type-2278",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10508,7 +10556,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1246"
@@ -10528,13 +10576,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2221",
+   "return_type" : "type-2224",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10544,13 +10592,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10560,13 +10608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10576,7 +10624,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
      "referenced_type" : "type-1280"
@@ -10592,16 +10640,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10611,10 +10659,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10627,13 +10675,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2291"
+     "referenced_type" : "type-2293"
     },
     {
-     "referenced_type" : "type-2288"
+     "referenced_type" : "type-2290"
     }
    ],
-   "return_type" : "type-2283",
+   "return_type" : "type-2286",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10681,13 +10729,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10751,7 +10799,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10764,7 +10812,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10777,7 +10825,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10790,7 +10838,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10815,7 +10863,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10825,13 +10873,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10841,13 +10889,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10857,19 +10905,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10879,10 +10927,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10892,10 +10940,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
    "return_type" : "type-6",
@@ -10908,7 +10956,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10921,17 +10969,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10941,20 +10989,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2228"
+     "referenced_type" : "type-2231"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10964,7 +11012,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     }
    ],
    "return_type" : "type-1299",
@@ -10977,13 +11025,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10993,13 +11041,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11009,19 +11057,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11031,16 +11079,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11050,7 +11098,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1284"
@@ -11066,13 +11114,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11085,10 +11133,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11101,13 +11149,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11117,13 +11165,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11133,19 +11181,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11155,13 +11203,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11171,13 +11219,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11187,19 +11235,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11210,16 +11258,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11230,22 +11278,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11256,16 +11304,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-2224"
+     "referenced_type" : "type-2227"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11275,16 +11323,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2226"
+     "referenced_type" : "type-2229"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2220",
+   "return_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11295,16 +11343,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11315,16 +11363,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11335,19 +11383,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11358,19 +11406,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11381,19 +11429,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11404,19 +11452,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2219"
+     "referenced_type" : "type-2222"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11426,10 +11474,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11439,10 +11487,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11452,7 +11500,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11465,10 +11513,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11478,10 +11526,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11491,7 +11539,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11506,24 +11554,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11559,41 +11607,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2220",
+   "referenced_type" : "type-2223",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11603,8 +11651,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11612,8 +11660,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11621,8 +11669,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11630,8 +11678,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11648,8 +11696,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11666,8 +11714,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11684,8 +11732,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11693,8 +11741,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11702,8 +11750,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11711,8 +11759,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2220",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11729,8 +11777,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2285",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11738,8 +11786,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11747,8 +11795,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11765,7 +11813,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11774,7 +11822,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11783,7 +11831,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11792,7 +11840,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11801,8 +11849,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11810,8 +11858,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11819,8 +11867,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11828,8 +11876,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11837,8 +11885,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11855,7 +11903,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11864,8 +11912,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11873,8 +11921,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1777",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11882,8 +11930,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11891,8 +11939,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2627",
-   "self_type" : "type-2626",
+   "referenced_type" : "type-2632",
+   "self_type" : "type-2631",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11900,8 +11948,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2841",
-   "self_type" : "type-2840",
+   "referenced_type" : "type-2843",
+   "self_type" : "type-2842",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11909,8 +11957,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-2917",
-   "self_type" : "type-2916",
+   "referenced_type" : "type-2920",
+   "self_type" : "type-2919",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11918,8 +11966,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11927,8 +11975,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11945,8 +11993,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11964,7 +12012,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11972,8 +12020,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11981,8 +12029,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11990,8 +12038,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11999,8 +12047,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12008,8 +12056,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12017,8 +12065,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12041,78 +12089,78 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2204",
+   "referenced_type" : "type-2206",
    "self_type" : "type-2230",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2252",
+   "self_type" : "type-2254",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2740",
-   "self_type" : "type-2742",
+   "referenced_type" : "type-2742",
+   "self_type" : "type-2744",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
    "referenced_type" : "type-3102",
-   "self_type" : "type-3134",
+   "self_type" : "type-3137",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-3368",
-   "self_type" : "type-3370",
+   "referenced_type" : "type-3371",
+   "self_type" : "type-3373",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2139",
+   "referenced_type" : "type-2138",
    "self_type" : "type-2149",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2277",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2731",
-   "self_type" : "type-2733",
+   "referenced_type" : "type-2733",
+   "self_type" : "type-2735",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3015",
-   "self_type" : "type-3025",
+   "referenced_type" : "type-3014",
+   "self_type" : "type-3024",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-3378",
-   "self_type" : "type-3380",
+   "referenced_type" : "type-3381",
+   "self_type" : "type-3383",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12128,7 +12176,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12137,8 +12185,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12146,8 +12194,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12164,8 +12212,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12173,8 +12221,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-1875",
-   "self_type" : "type-1874",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12182,8 +12230,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2009",
-   "self_type" : "type-2008",
+   "referenced_type" : "type-2012",
+   "self_type" : "type-2011",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12191,8 +12239,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2018",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12200,17 +12248,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3028",
-   "self_type" : "type-3027",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "const android::GrallocMapper &",
-   "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-3194",
-   "self_type" : "type-3193",
+   "referenced_type" : "type-3031",
+   "self_type" : "type-3030",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12227,6 +12266,15 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
+   "referenced_type" : "type-3201",
+   "self_type" : "type-3200",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "const android::GrallocMapper &",
+   "name" : "const android::GrallocMapper &",
    "referenced_type" : "type-612",
    "self_type" : "type-611",
    "size" : 4,
@@ -12236,8 +12284,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12245,8 +12293,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12255,7 +12303,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12263,8 +12311,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12290,8 +12338,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12299,8 +12347,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12308,8 +12356,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12317,8 +12365,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2219",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12326,8 +12374,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12335,8 +12383,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2284",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12344,8 +12392,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12353,8 +12401,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12407,8 +12455,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12416,8 +12464,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12425,8 +12473,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12488,8 +12536,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12507,7 +12555,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12524,8 +12572,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12533,8 +12581,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12560,8 +12608,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12569,7 +12617,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12578,7 +12626,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12587,7 +12635,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12602,44 +12650,44 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2261",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2266",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2743",
-   "self_type" : "type-2745",
+   "referenced_type" : "type-2745",
+   "self_type" : "type-2747",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3178",
-   "self_type" : "type-3190",
+   "referenced_type" : "type-3177",
+   "self_type" : "type-3191",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-3371",
-   "self_type" : "type-3373",
+   "referenced_type" : "type-3374",
+   "self_type" : "type-3376",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12662,169 +12710,169 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1767",
-   "self_type" : "type-1769",
+   "referenced_type" : "type-1768",
+   "self_type" : "type-1770",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1894",
+   "referenced_type" : "type-1894",
+   "self_type" : "type-1896",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1968",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1970",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2042",
-   "self_type" : "type-2044",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2048",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2096",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2098",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2160",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2326",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2545",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2552",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2580",
-   "self_type" : "type-2582",
+   "referenced_type" : "type-2586",
+   "self_type" : "type-2588",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2755",
-   "self_type" : "type-2757",
+   "referenced_type" : "type-2757",
+   "self_type" : "type-2759",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2816",
-   "self_type" : "type-2818",
+   "referenced_type" : "type-2818",
+   "self_type" : "type-2820",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2835",
-   "self_type" : "type-2837",
+   "referenced_type" : "type-2837",
+   "self_type" : "type-2839",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2902",
-   "self_type" : "type-2904",
+   "referenced_type" : "type-2905",
+   "self_type" : "type-2907",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3048",
-   "self_type" : "type-3050",
+   "referenced_type" : "type-3051",
+   "self_type" : "type-3053",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3139",
-   "self_type" : "type-3142",
+   "referenced_type" : "type-3143",
+   "self_type" : "type-3146",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3216",
-   "self_type" : "type-3218",
+   "referenced_type" : "type-3219",
+   "self_type" : "type-3221",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3258",
-   "self_type" : "type-3260",
+   "referenced_type" : "type-3261",
+   "self_type" : "type-3263",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3309",
-   "self_type" : "type-3311",
+   "referenced_type" : "type-3312",
+   "self_type" : "type-3314",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-3419",
-   "self_type" : "type-3421",
+   "referenced_type" : "type-3422",
+   "self_type" : "type-3424",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12837,15 +12885,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12884,8 +12932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12893,8 +12941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12903,7 +12951,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12920,8 +12968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2205",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12929,8 +12977,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2737",
-   "self_type" : "type-2739",
+   "referenced_type" : "type-2739",
+   "self_type" : "type-2741",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12938,8 +12986,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-3090",
-   "self_type" : "type-3098",
+   "referenced_type" : "type-3089",
+   "self_type" : "type-3095",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12947,8 +12995,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12956,8 +13004,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-2182",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2176",
+   "self_type" : "type-2190",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12965,8 +13013,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-2734",
-   "self_type" : "type-2736",
+   "referenced_type" : "type-2736",
+   "self_type" : "type-2738",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12974,8 +13022,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-3072",
-   "self_type" : "type-3082",
+   "referenced_type" : "type-3069",
+   "self_type" : "type-3083",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12992,8 +13040,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2280",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13001,8 +13049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2746",
-   "self_type" : "type-2748",
+   "referenced_type" : "type-2748",
+   "self_type" : "type-2750",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13010,7 +13058,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-3191",
+   "referenced_type" : "type-3194",
    "self_type" : "type-3196",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -13019,8 +13067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13028,8 +13076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2513",
-   "self_type" : "type-2520",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2525",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13037,8 +13085,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2808",
-   "self_type" : "type-2810",
+   "referenced_type" : "type-2810",
+   "self_type" : "type-2812",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13046,8 +13094,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-3610",
-   "self_type" : "type-3617",
+   "referenced_type" : "type-3616",
+   "self_type" : "type-3623",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13055,8 +13103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2142",
-   "self_type" : "type-2144",
+   "referenced_type" : "type-2144",
+   "self_type" : "type-2146",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13064,8 +13112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-3299",
-   "self_type" : "type-3301",
+   "referenced_type" : "type-3302",
+   "self_type" : "type-3304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -13082,8 +13130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13100,8 +13148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13109,8 +13157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13118,8 +13166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1818",
-   "self_type" : "type-1817",
+   "referenced_type" : "type-1819",
+   "self_type" : "type-1818",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13127,8 +13175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1887",
-   "self_type" : "type-1886",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13136,8 +13184,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1951",
-   "self_type" : "type-1950",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13145,8 +13193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2020",
-   "self_type" : "type-2019",
+   "referenced_type" : "type-2023",
+   "self_type" : "type-2022",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13154,8 +13202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2137",
-   "self_type" : "type-2136",
+   "referenced_type" : "type-2141",
+   "self_type" : "type-2140",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13163,8 +13211,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2198",
-   "self_type" : "type-2197",
+   "referenced_type" : "type-2201",
+   "self_type" : "type-2200",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13172,8 +13220,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13181,8 +13229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2555",
+   "self_type" : "type-2554",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13190,8 +13238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2681",
-   "self_type" : "type-2680",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13199,8 +13247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2794",
-   "self_type" : "type-2793",
+   "referenced_type" : "type-2796",
+   "self_type" : "type-2795",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13208,8 +13256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2820",
-   "self_type" : "type-2819",
+   "referenced_type" : "type-2822",
+   "self_type" : "type-2821",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13217,8 +13265,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2871",
-   "self_type" : "type-2870",
+   "referenced_type" : "type-2873",
+   "self_type" : "type-2872",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13226,8 +13274,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2962",
-   "self_type" : "type-2961",
+   "referenced_type" : "type-2964",
+   "self_type" : "type-2963",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13235,8 +13283,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3043",
-   "self_type" : "type-3042",
+   "referenced_type" : "type-3046",
+   "self_type" : "type-3045",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13244,8 +13292,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3118",
-   "self_type" : "type-3117",
+   "referenced_type" : "type-3122",
+   "self_type" : "type-3121",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13253,8 +13301,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3201",
-   "self_type" : "type-3200",
+   "referenced_type" : "type-3204",
+   "self_type" : "type-3203",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13262,8 +13310,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13271,8 +13319,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3296",
-   "self_type" : "type-3295",
+   "referenced_type" : "type-3299",
+   "self_type" : "type-3298",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13280,8 +13328,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3347",
-   "self_type" : "type-3346",
+   "referenced_type" : "type-3350",
+   "self_type" : "type-3349",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13289,8 +13337,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-3513",
-   "self_type" : "type-3512",
+   "referenced_type" : "type-3516",
+   "self_type" : "type-3515",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13298,8 +13346,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13307,8 +13355,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13325,8 +13373,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13334,8 +13382,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13343,8 +13391,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13352,8 +13400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13361,8 +13409,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13370,7 +13418,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13380,7 +13428,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13406,7 +13454,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13415,7 +13463,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13424,8 +13472,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13433,8 +13481,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1936",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1933",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13442,8 +13490,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13451,8 +13499,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2722",
-   "self_type" : "type-2721",
+   "referenced_type" : "type-2724",
+   "self_type" : "type-2723",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13460,8 +13508,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2823",
-   "self_type" : "type-2822",
+   "referenced_type" : "type-2825",
+   "self_type" : "type-2824",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13469,8 +13517,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-3375",
-   "self_type" : "type-3374",
+   "referenced_type" : "type-3378",
+   "self_type" : "type-3377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13478,8 +13526,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13487,8 +13535,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-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13496,8 +13544,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-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13505,8 +13553,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-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13514,8 +13562,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-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13523,8 +13571,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-3116",
-   "self_type" : "type-3115",
+   "referenced_type" : "type-3120",
+   "self_type" : "type-3119",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13532,8 +13580,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-3360",
-   "self_type" : "type-3359",
+   "referenced_type" : "type-3363",
+   "self_type" : "type-3362",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13541,8 +13589,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-3392",
-   "self_type" : "type-3391",
+   "referenced_type" : "type-3395",
+   "self_type" : "type-3394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13550,8 +13598,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-3397",
-   "self_type" : "type-3396",
+   "referenced_type" : "type-3400",
+   "self_type" : "type-3399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13568,7 +13616,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13577,7 +13625,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13586,7 +13634,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13598,8 +13646,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1882",
+   "self_type" : "type-1881",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13607,8 +13655,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-3035",
-   "self_type" : "type-3034",
+   "referenced_type" : "type-3039",
+   "self_type" : "type-3038",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13616,8 +13664,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13625,7 +13673,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13652,8 +13700,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2482",
-   "self_type" : "type-2481",
+   "referenced_type" : "type-2484",
+   "self_type" : "type-2483",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13661,8 +13709,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2504",
-   "self_type" : "type-2503",
+   "referenced_type" : "type-2506",
+   "self_type" : "type-2505",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13670,8 +13718,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2802",
-   "self_type" : "type-2801",
+   "referenced_type" : "type-2804",
+   "self_type" : "type-2803",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13679,8 +13727,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2807",
-   "self_type" : "type-2806",
+   "referenced_type" : "type-2809",
+   "self_type" : "type-2808",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13688,8 +13736,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3579",
-   "self_type" : "type-3578",
+   "referenced_type" : "type-3582",
+   "self_type" : "type-3581",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13697,8 +13745,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-3601",
-   "self_type" : "type-3600",
+   "referenced_type" : "type-3604",
+   "self_type" : "type-3603",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13715,8 +13763,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13724,8 +13772,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13733,8 +13781,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2529",
-   "self_type" : "type-2528",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13742,8 +13790,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2797",
-   "self_type" : "type-2796",
+   "referenced_type" : "type-2799",
+   "self_type" : "type-2798",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13751,8 +13799,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2812",
-   "self_type" : "type-2811",
+   "referenced_type" : "type-2814",
+   "self_type" : "type-2813",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13760,8 +13808,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3569",
-   "self_type" : "type-3568",
+   "referenced_type" : "type-3572",
+   "self_type" : "type-3571",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13769,8 +13817,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-3626",
-   "self_type" : "type-3625",
+   "referenced_type" : "type-3632",
+   "self_type" : "type-3631",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13787,8 +13835,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13797,7 +13845,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13814,8 +13862,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13832,8 +13880,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13841,8 +13889,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13850,8 +13898,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13859,8 +13907,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13877,8 +13925,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13886,8 +13934,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13895,8 +13943,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13904,8 +13952,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13913,8 +13961,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13922,8 +13970,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13940,8 +13988,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13949,8 +13997,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1780",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1781",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13958,8 +14006,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2647",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2649",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13967,8 +14015,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2843",
-   "self_type" : "type-2842",
+   "referenced_type" : "type-2845",
+   "self_type" : "type-2844",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13976,8 +14024,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13985,8 +14033,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-2921",
-   "self_type" : "type-2920",
+   "referenced_type" : "type-2923",
+   "self_type" : "type-2922",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13994,8 +14042,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -14003,8 +14051,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -14013,7 +14061,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2233",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -14030,8 +14078,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14039,8 +14087,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -14057,8 +14105,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14066,8 +14114,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14075,8 +14123,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -14093,8 +14141,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14102,8 +14150,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14129,8 +14177,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14138,8 +14186,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14147,8 +14195,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14156,8 +14204,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1765",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14165,8 +14213,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1765",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14174,8 +14222,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1838",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1839",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14183,8 +14231,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14192,8 +14240,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2039",
-   "self_type" : "type-2038",
+   "referenced_type" : "type-2042",
+   "self_type" : "type-2041",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14201,8 +14249,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14210,8 +14258,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14219,8 +14267,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14228,8 +14276,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14237,8 +14285,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2500",
-   "self_type" : "type-2499",
+   "referenced_type" : "type-2502",
+   "self_type" : "type-2501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14246,8 +14294,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2547",
+   "self_type" : "type-2546",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14255,8 +14303,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2577",
-   "self_type" : "type-2576",
+   "referenced_type" : "type-2582",
+   "self_type" : "type-2581",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14264,8 +14312,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2752",
-   "self_type" : "type-2751",
+   "referenced_type" : "type-2754",
+   "self_type" : "type-2753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14273,8 +14321,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2799",
-   "self_type" : "type-2798",
+   "referenced_type" : "type-2801",
+   "self_type" : "type-2800",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14282,8 +14330,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2804",
-   "self_type" : "type-2803",
+   "referenced_type" : "type-2806",
+   "self_type" : "type-2805",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14291,8 +14339,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2814",
-   "self_type" : "type-2813",
+   "referenced_type" : "type-2816",
+   "self_type" : "type-2815",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14300,8 +14348,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2833",
-   "self_type" : "type-2832",
+   "referenced_type" : "type-2835",
+   "self_type" : "type-2834",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14309,8 +14357,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2899",
-   "self_type" : "type-2898",
+   "referenced_type" : "type-2901",
+   "self_type" : "type-2900",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14318,8 +14366,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2984",
-   "self_type" : "type-2983",
+   "referenced_type" : "type-2986",
+   "self_type" : "type-2985",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14327,8 +14375,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3136",
-   "self_type" : "type-3135",
+   "referenced_type" : "type-3140",
+   "self_type" : "type-3139",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14336,8 +14384,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3214",
-   "self_type" : "type-3213",
+   "referenced_type" : "type-3217",
+   "self_type" : "type-3216",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14345,8 +14393,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3256",
-   "self_type" : "type-3255",
+   "referenced_type" : "type-3259",
+   "self_type" : "type-3258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14354,8 +14402,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3307",
-   "self_type" : "type-3306",
+   "referenced_type" : "type-3310",
+   "self_type" : "type-3309",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14363,8 +14411,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3405",
-   "self_type" : "type-3404",
+   "referenced_type" : "type-3408",
+   "self_type" : "type-3407",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14372,8 +14420,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3571",
-   "self_type" : "type-3570",
+   "referenced_type" : "type-3574",
+   "self_type" : "type-3573",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14381,8 +14429,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-3597",
-   "self_type" : "type-3596",
+   "referenced_type" : "type-3600",
+   "self_type" : "type-3599",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14390,8 +14438,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14399,8 +14447,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14408,8 +14456,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14417,8 +14465,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -14444,8 +14492,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -14462,8 +14510,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -14489,8 +14537,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -14498,8 +14546,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -14507,8 +14555,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14516,8 +14564,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2217",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14525,8 +14573,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14561,8 +14609,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2282",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14571,7 +14619,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14579,8 +14627,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2273",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14588,8 +14636,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14597,8 +14645,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14615,7 +14663,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14624,7 +14672,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14633,7 +14681,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14642,8 +14690,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14651,8 +14699,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14660,8 +14708,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14669,7 +14717,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14678,7 +14726,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14687,7 +14735,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14696,7 +14744,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14706,7 +14754,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14732,8 +14780,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14750,8 +14798,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14759,8 +14807,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14768,8 +14816,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14777,8 +14825,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14786,8 +14834,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14795,8 +14843,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14813,7 +14861,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14840,8 +14888,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14849,7 +14897,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14858,8 +14906,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14867,8 +14915,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1924",
-   "self_type" : "type-1923",
+   "referenced_type" : "type-1926",
+   "self_type" : "type-1925",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14876,8 +14924,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1956",
+   "self_type" : "type-1955",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14885,8 +14933,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2024",
-   "self_type" : "type-2023",
+   "referenced_type" : "type-2027",
+   "self_type" : "type-2026",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14894,8 +14942,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2696",
-   "self_type" : "type-2695",
+   "referenced_type" : "type-2698",
+   "self_type" : "type-2697",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14903,8 +14951,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2878",
-   "self_type" : "type-2877",
+   "referenced_type" : "type-2880",
+   "self_type" : "type-2879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14912,8 +14960,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3084",
-   "self_type" : "type-3083",
+   "referenced_type" : "type-3088",
+   "self_type" : "type-3087",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14921,8 +14969,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3122",
-   "self_type" : "type-3121",
+   "referenced_type" : "type-3126",
+   "self_type" : "type-3125",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14930,8 +14978,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-3204",
-   "self_type" : "type-3203",
+   "referenced_type" : "type-3207",
+   "self_type" : "type-3206",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14939,8 +14987,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14948,8 +14996,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14966,8 +15014,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14975,8 +15023,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14984,8 +15032,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14993,8 +15041,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2031",
-   "self_type" : "type-2030",
+   "referenced_type" : "type-2034",
+   "self_type" : "type-2033",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15002,8 +15050,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2966",
-   "self_type" : "type-2965",
+   "referenced_type" : "type-2968",
+   "self_type" : "type-2967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15011,8 +15059,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3129",
-   "self_type" : "type-3128",
+   "referenced_type" : "type-3133",
+   "self_type" : "type-3132",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15020,8 +15068,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-3210",
-   "self_type" : "type-3209",
+   "referenced_type" : "type-3213",
+   "self_type" : "type-3212",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15029,8 +15077,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15038,8 +15086,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15047,8 +15095,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15056,8 +15104,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15065,8 +15113,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1926",
-   "self_type" : "type-1925",
+   "referenced_type" : "type-1928",
+   "self_type" : "type-1927",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15074,8 +15122,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15083,8 +15131,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2027",
-   "self_type" : "type-2026",
+   "referenced_type" : "type-2029",
+   "self_type" : "type-2028",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15092,8 +15140,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2685",
-   "self_type" : "type-2684",
+   "referenced_type" : "type-2687",
+   "self_type" : "type-2686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15101,8 +15149,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2884",
-   "self_type" : "type-2883",
+   "referenced_type" : "type-2886",
+   "self_type" : "type-2885",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15110,8 +15158,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3087",
-   "self_type" : "type-3086",
+   "referenced_type" : "type-3092",
+   "self_type" : "type-3091",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15119,8 +15167,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3124",
-   "self_type" : "type-3123",
+   "referenced_type" : "type-3128",
+   "self_type" : "type-3127",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15128,8 +15176,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-3206",
-   "self_type" : "type-3205",
+   "referenced_type" : "type-3209",
+   "self_type" : "type-3208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15137,8 +15185,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15173,8 +15221,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15182,8 +15230,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1928",
-   "self_type" : "type-1927",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1929",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15191,8 +15239,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15200,8 +15248,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2029",
-   "self_type" : "type-2028",
+   "referenced_type" : "type-2031",
+   "self_type" : "type-2030",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15209,8 +15257,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2556",
-   "self_type" : "type-2555",
+   "referenced_type" : "type-2561",
+   "self_type" : "type-2560",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15218,8 +15266,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2828",
-   "self_type" : "type-2827",
+   "referenced_type" : "type-2830",
+   "self_type" : "type-2829",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15227,8 +15275,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3089",
-   "self_type" : "type-3088",
+   "referenced_type" : "type-3094",
+   "self_type" : "type-3093",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15236,8 +15284,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3127",
-   "self_type" : "type-3126",
+   "referenced_type" : "type-3131",
+   "self_type" : "type-3130",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15245,8 +15293,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-3208",
-   "self_type" : "type-3207",
+   "referenced_type" : "type-3211",
+   "self_type" : "type-3210",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15281,8 +15329,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15290,8 +15338,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15299,8 +15347,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2693",
-   "self_type" : "type-2692",
+   "referenced_type" : "type-2695",
+   "self_type" : "type-2694",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15308,8 +15356,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-2875",
-   "self_type" : "type-2874",
+   "referenced_type" : "type-2878",
+   "self_type" : "type-2877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15317,8 +15365,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15326,8 +15374,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1831",
-   "self_type" : "type-1830",
+   "referenced_type" : "type-1832",
+   "self_type" : "type-1831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15335,8 +15383,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15344,8 +15392,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2033",
-   "self_type" : "type-2032",
+   "referenced_type" : "type-2036",
+   "self_type" : "type-2035",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15353,8 +15401,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2976",
-   "self_type" : "type-2975",
+   "referenced_type" : "type-2978",
+   "self_type" : "type-2977",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15362,8 +15410,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3132",
-   "self_type" : "type-3131",
+   "referenced_type" : "type-3136",
+   "self_type" : "type-3135",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15371,8 +15419,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-3212",
-   "self_type" : "type-3211",
+   "referenced_type" : "type-3215",
+   "self_type" : "type-3214",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15380,8 +15428,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15398,8 +15446,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15425,8 +15473,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15443,8 +15491,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15461,8 +15509,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15470,8 +15518,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15480,7 +15528,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15497,8 +15545,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15506,8 +15554,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15515,8 +15563,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15524,8 +15572,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15533,8 +15581,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15542,8 +15590,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15551,8 +15599,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-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15569,8 +15617,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15578,8 +15626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2299",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15596,8 +15644,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -15605,8 +15653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15614,8 +15662,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-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -15624,7 +15672,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15632,8 +15680,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -15641,8 +15689,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1884",
+   "referenced_type" : "type-1884",
+   "self_type" : "type-1886",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15650,8 +15698,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-3038",
-   "self_type" : "type-3040",
+   "referenced_type" : "type-3041",
+   "self_type" : "type-3043",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15668,7 +15716,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -15677,8 +15725,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15713,8 +15761,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15722,8 +15770,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15740,8 +15788,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15749,8 +15797,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15758,8 +15806,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15767,8 +15815,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15776,8 +15824,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15785,8 +15833,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15794,8 +15842,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15803,8 +15851,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15812,8 +15860,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2235",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15866,8 +15914,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2229",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15884,8 +15932,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15893,8 +15941,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15902,8 +15950,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2222",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15911,8 +15959,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15920,8 +15968,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15938,7 +15986,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15966,7 +16014,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15974,8 +16022,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -16001,8 +16049,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16010,8 +16058,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16019,8 +16067,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16028,8 +16076,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -16055,8 +16103,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16064,8 +16112,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16082,8 +16130,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16091,8 +16139,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2713",
-   "self_type" : "type-2715",
+   "referenced_type" : "type-2715",
+   "self_type" : "type-2717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16100,8 +16148,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2879",
-   "self_type" : "type-2882",
+   "referenced_type" : "type-2882",
+   "self_type" : "type-2884",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16109,8 +16157,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16118,8 +16166,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1827",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1828",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16127,8 +16175,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2972",
-   "self_type" : "type-2974",
+   "referenced_type" : "type-2974",
+   "self_type" : "type-2976",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16136,8 +16184,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16145,8 +16193,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16154,8 +16202,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16163,8 +16211,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16172,8 +16220,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16181,8 +16229,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2553",
-   "self_type" : "type-2552",
+   "referenced_type" : "type-2558",
+   "self_type" : "type-2557",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16190,8 +16238,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2825",
-   "self_type" : "type-2824",
+   "referenced_type" : "type-2827",
+   "self_type" : "type-2826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16199,8 +16247,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16208,8 +16256,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16217,8 +16265,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2563",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2570",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16226,8 +16274,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2829",
-   "self_type" : "type-2831",
+   "referenced_type" : "type-2831",
+   "self_type" : "type-2833",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16235,8 +16283,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16244,8 +16292,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16253,8 +16301,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2887",
-   "self_type" : "type-2886",
+   "referenced_type" : "type-2889",
+   "self_type" : "type-2888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16262,8 +16310,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16280,8 +16328,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16289,8 +16337,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16298,8 +16346,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16316,8 +16364,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16325,8 +16373,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -16343,8 +16391,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "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/IBase.h"
   },
@@ -16352,8 +16400,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -16362,7 +16410,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16379,8 +16427,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16388,8 +16436,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16397,8 +16445,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16406,8 +16454,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16415,8 +16463,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16433,8 +16481,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-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16442,8 +16490,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-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -16460,8 +16508,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2293",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16469,8 +16517,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2298",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -16478,8 +16526,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16487,8 +16535,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16496,8 +16544,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16505,8 +16553,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16514,7 +16562,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -16533,7 +16581,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16541,8 +16589,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16550,8 +16598,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16559,8 +16607,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16568,7 +16616,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -16577,8 +16625,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16595,8 +16643,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16604,8 +16652,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16613,8 +16661,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16622,8 +16670,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16631,8 +16679,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16658,8 +16706,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -16667,42 +16715,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -16710,8 +16722,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -16719,10 +16731,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16730,8 +16796,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16739,8 +16805,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16748,8 +16814,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16757,8 +16823,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16766,8 +16832,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16775,8 +16841,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16784,8 +16850,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16802,8 +16868,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16811,7 +16877,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16820,8 +16886,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16829,8 +16895,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16838,8 +16904,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16856,8 +16922,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-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16865,8 +16931,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16874,8 +16940,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16883,8 +16949,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16892,8 +16958,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16905,8 +16971,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16935,8 +17001,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16945,8 +17011,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16955,8 +17021,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16965,8 +17031,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-1765",
+   "self_type" : "type-1767",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16975,8 +17041,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1764",
-   "self_type" : "type-1766",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16985,8 +17051,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1840",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1841",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16995,8 +17061,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1965",
+   "self_type" : "type-1967",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17005,8 +17071,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2038",
-   "self_type" : "type-2040",
+   "referenced_type" : "type-2041",
+   "self_type" : "type-2043",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17015,8 +17081,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2095",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17025,8 +17091,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2155",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17035,8 +17101,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17045,8 +17111,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17055,8 +17121,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2499",
-   "self_type" : "type-2501",
+   "referenced_type" : "type-2501",
+   "self_type" : "type-2503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17065,8 +17131,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2541",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2549",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17075,8 +17141,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2576",
-   "self_type" : "type-2578",
+   "referenced_type" : "type-2581",
+   "self_type" : "type-2583",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17085,8 +17151,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2751",
-   "self_type" : "type-2753",
+   "referenced_type" : "type-2753",
+   "self_type" : "type-2755",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17095,8 +17161,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2798",
-   "self_type" : "type-2800",
+   "referenced_type" : "type-2800",
+   "self_type" : "type-2802",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17105,8 +17171,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2803",
-   "self_type" : "type-2805",
+   "referenced_type" : "type-2805",
+   "self_type" : "type-2807",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17115,8 +17181,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2813",
-   "self_type" : "type-2815",
+   "referenced_type" : "type-2815",
+   "self_type" : "type-2817",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17125,8 +17191,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2832",
-   "self_type" : "type-2834",
+   "referenced_type" : "type-2834",
+   "self_type" : "type-2836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17135,8 +17201,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2898",
-   "self_type" : "type-2900",
+   "referenced_type" : "type-2900",
+   "self_type" : "type-2902",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17145,8 +17211,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2983",
-   "self_type" : "type-2985",
+   "referenced_type" : "type-2985",
+   "self_type" : "type-2987",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17155,8 +17221,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3135",
-   "self_type" : "type-3137",
+   "referenced_type" : "type-3139",
+   "self_type" : "type-3141",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17165,8 +17231,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3213",
-   "self_type" : "type-3215",
+   "referenced_type" : "type-3216",
+   "self_type" : "type-3218",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17175,8 +17241,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3255",
-   "self_type" : "type-3257",
+   "referenced_type" : "type-3258",
+   "self_type" : "type-3260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17185,8 +17251,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3306",
-   "self_type" : "type-3308",
+   "referenced_type" : "type-3309",
+   "self_type" : "type-3311",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17195,8 +17261,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3404",
-   "self_type" : "type-3403",
+   "referenced_type" : "type-3407",
+   "self_type" : "type-3406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17205,8 +17271,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3570",
-   "self_type" : "type-3572",
+   "referenced_type" : "type-3573",
+   "self_type" : "type-3575",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17215,8 +17281,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-3596",
-   "self_type" : "type-3598",
+   "referenced_type" : "type-3599",
+   "self_type" : "type-3601",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17225,8 +17291,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17235,8 +17301,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17245,8 +17311,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17255,8 +17321,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -17285,8 +17351,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17302,24 +17368,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2205",
-   "self_type" : "type-2204",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2250",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2741",
-   "self_type" : "type-2740",
+   "referenced_type" : "type-2743",
+   "self_type" : "type-2742",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17334,24 +17400,24 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-3369",
-   "self_type" : "type-3368",
+   "referenced_type" : "type-3372",
+   "self_type" : "type-3371",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-1883",
-   "self_type" : "type-1882",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-3039",
-   "self_type" : "type-3038",
+   "referenced_type" : "type-3042",
+   "self_type" : "type-3041",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -17367,8 +17433,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -17376,48 +17442,48 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2140",
-   "self_type" : "type-2139",
+   "referenced_type" : "type-2139",
+   "self_type" : "type-2138",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2732",
-   "self_type" : "type-2731",
+   "referenced_type" : "type-2734",
+   "self_type" : "type-2733",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3016",
-   "self_type" : "type-3015",
+   "referenced_type" : "type-3015",
+   "self_type" : "type-3014",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-3379",
-   "self_type" : "type-3378",
+   "referenced_type" : "type-3382",
+   "self_type" : "type-3381",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -17425,8 +17491,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -17446,7 +17512,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -17475,8 +17541,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17485,8 +17551,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17495,8 +17561,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17505,8 +17571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -17525,8 +17591,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -17535,8 +17601,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17545,8 +17611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -17555,8 +17621,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1878",
+   "self_type" : "type-1877",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17565,8 +17631,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2010",
-   "self_type" : "type-2009",
+   "referenced_type" : "type-2013",
+   "self_type" : "type-2012",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17575,8 +17641,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2019",
+   "self_type" : "type-2018",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17585,18 +17651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3029",
-   "self_type" : "type-3028",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const android::GrallocMapper",
-   "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-3195",
-   "self_type" : "type-3194",
+   "referenced_type" : "type-3032",
+   "self_type" : "type-3031",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17615,6 +17671,16 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
+   "referenced_type" : "type-3202",
+   "self_type" : "type-3201",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const android::GrallocMapper",
+   "name" : "const android::GrallocMapper",
    "referenced_type" : "type-613",
    "self_type" : "type-612",
    "size" : 4,
@@ -17625,8 +17691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17635,8 +17701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17645,8 +17711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -17655,8 +17721,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -17665,7 +17731,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -17675,8 +17741,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -17686,7 +17752,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -17695,8 +17761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -17706,7 +17772,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2231",
+   "self_type" : "type-2234",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -17755,7 +17821,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -17765,8 +17831,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -17785,8 +17851,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17795,8 +17861,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17805,8 +17871,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2218",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17815,8 +17881,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -17825,8 +17891,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -17846,7 +17912,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -17855,8 +17921,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2283",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -17865,8 +17931,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17875,8 +17941,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -17895,7 +17961,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -17905,7 +17971,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17915,7 +17981,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17925,7 +17991,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17935,8 +18001,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17945,8 +18011,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17956,7 +18022,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17985,8 +18051,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17995,8 +18061,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -18005,8 +18071,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18015,8 +18081,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18025,8 +18091,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -18035,7 +18101,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18055,8 +18121,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18065,8 +18131,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18075,7 +18141,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -18085,8 +18151,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18095,8 +18161,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2714",
-   "self_type" : "type-2713",
+   "referenced_type" : "type-2716",
+   "self_type" : "type-2715",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18105,8 +18171,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-2880",
-   "self_type" : "type-2879",
+   "referenced_type" : "type-2883",
+   "self_type" : "type-2882",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18115,8 +18181,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18125,8 +18191,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18135,8 +18201,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2973",
-   "self_type" : "type-2972",
+   "referenced_type" : "type-2975",
+   "self_type" : "type-2974",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18145,8 +18211,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18155,8 +18221,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18225,8 +18291,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -18275,8 +18341,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -18325,8 +18391,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18335,8 +18401,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2554",
-   "self_type" : "type-2553",
+   "referenced_type" : "type-2559",
+   "self_type" : "type-2558",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18345,8 +18411,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-2826",
-   "self_type" : "type-2825",
+   "referenced_type" : "type-2828",
+   "self_type" : "type-2827",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18355,8 +18421,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18365,8 +18431,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18375,8 +18441,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2564",
-   "self_type" : "type-2563",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18385,8 +18451,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-2830",
-   "self_type" : "type-2829",
+   "referenced_type" : "type-2832",
+   "self_type" : "type-2831",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18395,8 +18461,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18405,8 +18471,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1754",
-   "self_type" : "type-1753",
+   "referenced_type" : "type-1755",
+   "self_type" : "type-1754",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18415,8 +18481,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-2888",
-   "self_type" : "type-2887",
+   "referenced_type" : "type-2890",
+   "self_type" : "type-2889",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18425,8 +18491,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18445,8 +18511,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18455,8 +18521,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18465,8 +18531,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18475,7 +18541,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -18505,8 +18571,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18515,8 +18581,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -18535,8 +18601,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-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "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"
   },
@@ -18545,8 +18611,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -18555,8 +18621,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-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "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"
   },
@@ -18585,8 +18651,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -18595,8 +18661,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -18605,8 +18671,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18615,8 +18681,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18625,8 +18691,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18635,8 +18701,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18645,8 +18711,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18665,8 +18731,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-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18675,8 +18741,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-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -18695,8 +18761,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2289",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18705,8 +18771,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2297",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -18716,7 +18782,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18725,8 +18791,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -18735,8 +18801,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -18745,8 +18811,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18756,7 +18822,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -18772,40 +18838,40 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2744",
-   "self_type" : "type-2743",
+   "referenced_type" : "type-2746",
+   "self_type" : "type-2745",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3179",
-   "self_type" : "type-3178",
+   "referenced_type" : "type-3178",
+   "self_type" : "type-3177",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-3372",
-   "self_type" : "type-3371",
+   "referenced_type" : "type-3375",
+   "self_type" : "type-3374",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -18813,8 +18879,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -18823,8 +18889,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -18833,8 +18899,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -18850,192 +18916,192 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1768",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1893",
-   "self_type" : "type-1892",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2043",
-   "self_type" : "type-2042",
+   "referenced_type" : "type-2047",
+   "self_type" : "type-2046",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2157",
-   "self_type" : "type-2156",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2551",
+   "self_type" : "type-2550",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2581",
-   "self_type" : "type-2580",
+   "referenced_type" : "type-2587",
+   "self_type" : "type-2586",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2756",
-   "self_type" : "type-2755",
+   "referenced_type" : "type-2758",
+   "self_type" : "type-2757",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2817",
-   "self_type" : "type-2816",
+   "referenced_type" : "type-2819",
+   "self_type" : "type-2818",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2836",
-   "self_type" : "type-2835",
+   "referenced_type" : "type-2838",
+   "self_type" : "type-2837",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2903",
-   "self_type" : "type-2902",
+   "referenced_type" : "type-2906",
+   "self_type" : "type-2905",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3049",
-   "self_type" : "type-3048",
+   "referenced_type" : "type-3052",
+   "self_type" : "type-3051",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3140",
-   "self_type" : "type-3139",
+   "referenced_type" : "type-3144",
+   "self_type" : "type-3143",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3217",
-   "self_type" : "type-3216",
+   "referenced_type" : "type-3220",
+   "self_type" : "type-3219",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3259",
-   "self_type" : "type-3258",
+   "referenced_type" : "type-3262",
+   "self_type" : "type-3261",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3310",
-   "self_type" : "type-3309",
+   "referenced_type" : "type-3313",
+   "self_type" : "type-3312",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-3420",
-   "self_type" : "type-3419",
+   "referenced_type" : "type-3423",
+   "self_type" : "type-3422",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19050,16 +19116,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -19093,7 +19159,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -19103,8 +19169,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -19113,8 +19179,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19124,7 +19190,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -19153,8 +19219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19163,8 +19229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2738",
-   "self_type" : "type-2737",
+   "referenced_type" : "type-2740",
+   "self_type" : "type-2739",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19173,8 +19239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-3091",
-   "self_type" : "type-3090",
+   "referenced_type" : "type-3090",
+   "self_type" : "type-3089",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -19193,8 +19259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19203,8 +19269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19213,8 +19279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1902",
+   "self_type" : "type-1901",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19223,8 +19289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19233,8 +19299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2054",
-   "self_type" : "type-2053",
+   "referenced_type" : "type-2057",
+   "self_type" : "type-2056",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19243,8 +19309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19253,8 +19319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2162",
-   "self_type" : "type-2161",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19263,8 +19329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19273,8 +19339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2656",
-   "self_type" : "type-2655",
+   "referenced_type" : "type-2658",
+   "self_type" : "type-2657",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19283,8 +19349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2762",
-   "self_type" : "type-2761",
+   "referenced_type" : "type-2764",
+   "self_type" : "type-2763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19293,8 +19359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2849",
-   "self_type" : "type-2848",
+   "referenced_type" : "type-2851",
+   "self_type" : "type-2850",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19303,8 +19369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2925",
-   "self_type" : "type-2924",
+   "referenced_type" : "type-2928",
+   "self_type" : "type-2927",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19313,8 +19379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19323,8 +19389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3056",
-   "self_type" : "type-3055",
+   "referenced_type" : "type-3060",
+   "self_type" : "type-3059",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19333,8 +19399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3154",
-   "self_type" : "type-3153",
+   "referenced_type" : "type-3158",
+   "self_type" : "type-3157",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19343,8 +19409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3224",
-   "self_type" : "type-3223",
+   "referenced_type" : "type-3227",
+   "self_type" : "type-3226",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19353,8 +19419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3264",
-   "self_type" : "type-3263",
+   "referenced_type" : "type-3267",
+   "self_type" : "type-3266",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19363,8 +19429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3315",
-   "self_type" : "type-3314",
+   "referenced_type" : "type-3318",
+   "self_type" : "type-3317",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19373,8 +19439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-3458",
-   "self_type" : "type-3457",
+   "referenced_type" : "type-3461",
+   "self_type" : "type-3460",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19383,8 +19449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19403,8 +19469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19413,8 +19479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19423,8 +19489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19443,8 +19509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19463,8 +19529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19473,8 +19539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1792",
-   "self_type" : "type-1791",
+   "referenced_type" : "type-1793",
+   "self_type" : "type-1792",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19483,8 +19549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19493,8 +19559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19503,8 +19569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19513,8 +19579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19523,8 +19589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19533,8 +19599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19543,8 +19609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2661",
+   "referenced_type" : "type-2664",
+   "self_type" : "type-2663",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19553,8 +19619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2768",
-   "self_type" : "type-2767",
+   "referenced_type" : "type-2770",
+   "self_type" : "type-2769",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19563,8 +19629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2855",
-   "self_type" : "type-2854",
+   "referenced_type" : "type-2857",
+   "self_type" : "type-2856",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19573,8 +19639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2932",
-   "self_type" : "type-2931",
+   "referenced_type" : "type-2934",
+   "self_type" : "type-2933",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19583,8 +19649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3062",
-   "self_type" : "type-3061",
+   "referenced_type" : "type-3066",
+   "self_type" : "type-3065",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19593,8 +19659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19603,8 +19669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3161",
-   "self_type" : "type-3160",
+   "referenced_type" : "type-3165",
+   "self_type" : "type-3164",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19613,8 +19679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3230",
-   "self_type" : "type-3229",
+   "referenced_type" : "type-3233",
+   "self_type" : "type-3232",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19623,8 +19689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3270",
-   "self_type" : "type-3269",
+   "referenced_type" : "type-3273",
+   "self_type" : "type-3272",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19633,8 +19699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3321",
-   "self_type" : "type-3320",
+   "referenced_type" : "type-3324",
+   "self_type" : "type-3323",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19643,8 +19709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-3464",
-   "self_type" : "type-3463",
+   "referenced_type" : "type-3467",
+   "self_type" : "type-3466",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19653,8 +19719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19663,8 +19729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19683,8 +19749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19693,8 +19759,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19703,8 +19769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19723,8 +19789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19733,8 +19799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1794",
-   "self_type" : "type-1793",
+   "referenced_type" : "type-1795",
+   "self_type" : "type-1794",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19743,8 +19809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1908",
-   "self_type" : "type-1907",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19753,8 +19819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1984",
-   "self_type" : "type-1983",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19763,8 +19829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2063",
-   "self_type" : "type-2062",
+   "referenced_type" : "type-2066",
+   "self_type" : "type-2065",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19773,8 +19839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19783,8 +19849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2172",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19793,8 +19859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19803,8 +19869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2666",
+   "self_type" : "type-2665",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19813,8 +19879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2770",
-   "self_type" : "type-2769",
+   "referenced_type" : "type-2772",
+   "self_type" : "type-2771",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19823,8 +19889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2857",
-   "self_type" : "type-2856",
+   "referenced_type" : "type-2859",
+   "self_type" : "type-2858",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19833,8 +19899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2934",
-   "self_type" : "type-2933",
+   "referenced_type" : "type-2937",
+   "self_type" : "type-2936",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19843,8 +19909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3064",
-   "self_type" : "type-3063",
+   "referenced_type" : "type-3068",
+   "self_type" : "type-3067",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19853,8 +19919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19863,8 +19929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3163",
-   "self_type" : "type-3162",
+   "referenced_type" : "type-3167",
+   "self_type" : "type-3166",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19873,8 +19939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3232",
-   "self_type" : "type-3231",
+   "referenced_type" : "type-3235",
+   "self_type" : "type-3234",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19883,8 +19949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3272",
-   "self_type" : "type-3271",
+   "referenced_type" : "type-3275",
+   "self_type" : "type-3274",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19893,8 +19959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3323",
-   "self_type" : "type-3322",
+   "referenced_type" : "type-3326",
+   "self_type" : "type-3325",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19903,8 +19969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-3466",
-   "self_type" : "type-3465",
+   "referenced_type" : "type-3469",
+   "self_type" : "type-3468",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19913,8 +19979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19923,8 +19989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19943,8 +20009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19953,8 +20019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19973,8 +20039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19983,8 +20049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1790",
-   "self_type" : "type-1789",
+   "referenced_type" : "type-1791",
+   "self_type" : "type-1790",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19993,8 +20059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1904",
-   "self_type" : "type-1903",
+   "referenced_type" : "type-1906",
+   "self_type" : "type-1905",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20003,8 +20069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1982",
+   "self_type" : "type-1981",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20013,8 +20079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2058",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20023,8 +20089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20033,8 +20099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2168",
+   "self_type" : "type-2167",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20043,8 +20109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20053,8 +20119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2660",
-   "self_type" : "type-2659",
+   "referenced_type" : "type-2662",
+   "self_type" : "type-2661",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20063,8 +20129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2766",
-   "self_type" : "type-2765",
+   "referenced_type" : "type-2768",
+   "self_type" : "type-2767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20073,8 +20139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2853",
-   "self_type" : "type-2852",
+   "referenced_type" : "type-2855",
+   "self_type" : "type-2854",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20083,8 +20149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2930",
-   "self_type" : "type-2929",
+   "referenced_type" : "type-2932",
+   "self_type" : "type-2931",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20093,8 +20159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3060",
-   "self_type" : "type-3059",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20103,8 +20169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-3064",
+   "self_type" : "type-3063",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20113,8 +20179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3158",
-   "self_type" : "type-3157",
+   "referenced_type" : "type-3162",
+   "self_type" : "type-3161",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20123,8 +20189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3228",
-   "self_type" : "type-3227",
+   "referenced_type" : "type-3231",
+   "self_type" : "type-3230",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20133,8 +20199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3268",
-   "self_type" : "type-3267",
+   "referenced_type" : "type-3271",
+   "self_type" : "type-3270",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20143,8 +20209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3319",
-   "self_type" : "type-3318",
+   "referenced_type" : "type-3322",
+   "self_type" : "type-3321",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20153,8 +20219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-3462",
-   "self_type" : "type-3461",
+   "referenced_type" : "type-3465",
+   "self_type" : "type-3464",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20163,8 +20229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20173,8 +20239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20183,8 +20249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20193,8 +20259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20203,8 +20269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20223,8 +20289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20243,8 +20309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20253,8 +20319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1796",
-   "self_type" : "type-1795",
+   "referenced_type" : "type-1797",
+   "self_type" : "type-1796",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20263,8 +20329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1909",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1911",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20273,8 +20339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20283,8 +20349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2065",
-   "self_type" : "type-2064",
+   "referenced_type" : "type-2068",
+   "self_type" : "type-2067",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20293,8 +20359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2114",
+   "self_type" : "type-2113",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20303,8 +20369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20313,8 +20379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20323,8 +20389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2666",
-   "self_type" : "type-2665",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20333,8 +20399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2772",
-   "self_type" : "type-2771",
+   "referenced_type" : "type-2774",
+   "self_type" : "type-2773",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20343,8 +20409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2859",
-   "self_type" : "type-2858",
+   "referenced_type" : "type-2861",
+   "self_type" : "type-2860",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20353,8 +20419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2936",
-   "self_type" : "type-2935",
+   "referenced_type" : "type-2939",
+   "self_type" : "type-2938",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20363,8 +20429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3067",
-   "self_type" : "type-3066",
+   "referenced_type" : "type-3072",
+   "self_type" : "type-3071",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20373,8 +20439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20383,8 +20449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3165",
-   "self_type" : "type-3164",
+   "referenced_type" : "type-3169",
+   "self_type" : "type-3168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20393,8 +20459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3234",
-   "self_type" : "type-3233",
+   "referenced_type" : "type-3237",
+   "self_type" : "type-3236",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20403,8 +20469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3274",
-   "self_type" : "type-3273",
+   "referenced_type" : "type-3277",
+   "self_type" : "type-3276",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20413,8 +20479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3325",
-   "self_type" : "type-3324",
+   "referenced_type" : "type-3328",
+   "self_type" : "type-3327",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20423,8 +20489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-3468",
-   "self_type" : "type-3467",
+   "referenced_type" : "type-3471",
+   "self_type" : "type-3470",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20433,8 +20499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20463,8 +20529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20473,8 +20539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20493,8 +20559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20503,8 +20569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1784",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1785",
+   "self_type" : "type-1784",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20513,8 +20579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1900",
+   "self_type" : "type-1899",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20523,8 +20589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20533,8 +20599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2052",
-   "self_type" : "type-2051",
+   "referenced_type" : "type-2055",
+   "self_type" : "type-2054",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20543,8 +20609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20553,8 +20619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20563,8 +20629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20573,8 +20639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20583,8 +20649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2760",
-   "self_type" : "type-2759",
+   "referenced_type" : "type-2762",
+   "self_type" : "type-2761",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20593,8 +20659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2847",
-   "self_type" : "type-2846",
+   "referenced_type" : "type-2849",
+   "self_type" : "type-2848",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20603,8 +20669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2923",
-   "self_type" : "type-2922",
+   "referenced_type" : "type-2925",
+   "self_type" : "type-2924",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20613,8 +20679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20623,8 +20689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3054",
-   "self_type" : "type-3053",
+   "referenced_type" : "type-3057",
+   "self_type" : "type-3056",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20633,8 +20699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3152",
-   "self_type" : "type-3151",
+   "referenced_type" : "type-3156",
+   "self_type" : "type-3155",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20643,8 +20709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3222",
-   "self_type" : "type-3221",
+   "referenced_type" : "type-3225",
+   "self_type" : "type-3224",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20653,8 +20719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3262",
-   "self_type" : "type-3261",
+   "referenced_type" : "type-3265",
+   "self_type" : "type-3264",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20663,8 +20729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3313",
-   "self_type" : "type-3312",
+   "referenced_type" : "type-3316",
+   "self_type" : "type-3315",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20673,8 +20739,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-3456",
-   "self_type" : "type-3455",
+   "referenced_type" : "type-3459",
+   "self_type" : "type-3458",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20683,8 +20749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20693,8 +20759,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20713,8 +20779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20723,8 +20789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20753,8 +20819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20763,8 +20829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1788",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1789",
+   "self_type" : "type-1788",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20773,8 +20839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20783,8 +20849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20793,8 +20859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2056",
-   "self_type" : "type-2055",
+   "referenced_type" : "type-2059",
+   "self_type" : "type-2058",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20803,8 +20869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20813,8 +20879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20823,8 +20889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20833,8 +20899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2658",
-   "self_type" : "type-2657",
+   "referenced_type" : "type-2660",
+   "self_type" : "type-2659",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20843,8 +20909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2764",
-   "self_type" : "type-2763",
+   "referenced_type" : "type-2766",
+   "self_type" : "type-2765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20853,8 +20919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2851",
-   "self_type" : "type-2850",
+   "referenced_type" : "type-2853",
+   "self_type" : "type-2852",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20863,8 +20929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2927",
-   "self_type" : "type-2926",
+   "referenced_type" : "type-2930",
+   "self_type" : "type-2929",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20873,8 +20939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20883,8 +20949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3058",
-   "self_type" : "type-3057",
+   "referenced_type" : "type-3062",
+   "self_type" : "type-3061",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20893,8 +20959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3156",
-   "self_type" : "type-3155",
+   "referenced_type" : "type-3160",
+   "self_type" : "type-3159",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20903,8 +20969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3226",
-   "self_type" : "type-3225",
+   "referenced_type" : "type-3229",
+   "self_type" : "type-3228",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20913,8 +20979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3266",
-   "self_type" : "type-3265",
+   "referenced_type" : "type-3269",
+   "self_type" : "type-3268",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20923,8 +20989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3317",
-   "self_type" : "type-3316",
+   "referenced_type" : "type-3320",
+   "self_type" : "type-3319",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20933,8 +20999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-3460",
-   "self_type" : "type-3459",
+   "referenced_type" : "type-3463",
+   "self_type" : "type-3462",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20943,8 +21009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20963,8 +21029,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20973,8 +21039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -20983,8 +21049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -21003,8 +21069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21023,8 +21089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21033,8 +21099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1800",
-   "self_type" : "type-1799",
+   "referenced_type" : "type-1801",
+   "self_type" : "type-1800",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21043,8 +21109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1914",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21053,8 +21119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21063,8 +21129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21073,8 +21139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2116",
-   "self_type" : "type-2115",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21083,8 +21149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2177",
-   "self_type" : "type-2176",
+   "referenced_type" : "type-2181",
+   "self_type" : "type-2180",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21093,8 +21159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21103,8 +21169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2671",
-   "self_type" : "type-2670",
+   "referenced_type" : "type-2673",
+   "self_type" : "type-2672",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21113,8 +21179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2776",
-   "self_type" : "type-2775",
+   "referenced_type" : "type-2778",
+   "self_type" : "type-2777",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21123,8 +21189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2863",
-   "self_type" : "type-2862",
+   "referenced_type" : "type-2865",
+   "self_type" : "type-2864",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21133,8 +21199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2941",
-   "self_type" : "type-2940",
+   "referenced_type" : "type-2944",
+   "self_type" : "type-2943",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21143,8 +21209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3071",
-   "self_type" : "type-3070",
+   "referenced_type" : "type-3076",
+   "self_type" : "type-3075",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21153,8 +21219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3170",
-   "self_type" : "type-3169",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21163,8 +21229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-3174",
+   "self_type" : "type-3173",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21173,8 +21239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3238",
-   "self_type" : "type-3237",
+   "referenced_type" : "type-3241",
+   "self_type" : "type-3240",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21183,8 +21249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3278",
-   "self_type" : "type-3277",
+   "referenced_type" : "type-3281",
+   "self_type" : "type-3280",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21193,8 +21259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3329",
-   "self_type" : "type-3328",
+   "referenced_type" : "type-3332",
+   "self_type" : "type-3331",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21203,8 +21269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-3476",
-   "self_type" : "type-3475",
+   "referenced_type" : "type-3479",
+   "self_type" : "type-3478",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21213,8 +21279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21223,8 +21289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21233,8 +21299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21243,8 +21309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21253,8 +21319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21263,8 +21329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21283,8 +21349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21293,8 +21359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1804",
-   "self_type" : "type-1803",
+   "referenced_type" : "type-1805",
+   "self_type" : "type-1804",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21303,8 +21369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21313,8 +21379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21323,8 +21389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21333,8 +21399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21343,8 +21409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2181",
-   "self_type" : "type-2180",
+   "referenced_type" : "type-2185",
+   "self_type" : "type-2184",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21353,8 +21419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2384",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21363,8 +21429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2675",
-   "self_type" : "type-2674",
+   "referenced_type" : "type-2677",
+   "self_type" : "type-2676",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21373,8 +21439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2780",
-   "self_type" : "type-2779",
+   "referenced_type" : "type-2782",
+   "self_type" : "type-2781",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21383,8 +21449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2867",
-   "self_type" : "type-2866",
+   "referenced_type" : "type-2869",
+   "self_type" : "type-2868",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21393,8 +21459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2945",
-   "self_type" : "type-2944",
+   "referenced_type" : "type-2948",
+   "self_type" : "type-2947",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21403,8 +21469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3077",
-   "self_type" : "type-3076",
+   "referenced_type" : "type-3080",
+   "self_type" : "type-3079",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21413,8 +21479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3175",
-   "self_type" : "type-3174",
+   "referenced_type" : "type-3180",
+   "self_type" : "type-3179",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21423,8 +21489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21433,8 +21499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3242",
-   "self_type" : "type-3241",
+   "referenced_type" : "type-3245",
+   "self_type" : "type-3244",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21443,8 +21509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3282",
-   "self_type" : "type-3281",
+   "referenced_type" : "type-3285",
+   "self_type" : "type-3284",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21453,8 +21519,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3333",
-   "self_type" : "type-3332",
+   "referenced_type" : "type-3336",
+   "self_type" : "type-3335",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21463,8 +21529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-3480",
-   "self_type" : "type-3479",
+   "referenced_type" : "type-3483",
+   "self_type" : "type-3482",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21473,8 +21539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21483,8 +21549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21503,8 +21569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21513,8 +21579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21523,8 +21589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21543,8 +21609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21553,8 +21619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1802",
-   "self_type" : "type-1801",
+   "referenced_type" : "type-1803",
+   "self_type" : "type-1802",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21563,8 +21629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1916",
-   "self_type" : "type-1915",
+   "referenced_type" : "type-1918",
+   "self_type" : "type-1917",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21573,8 +21639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1992",
-   "self_type" : "type-1991",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21583,8 +21649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2072",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2075",
+   "self_type" : "type-2074",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21593,8 +21659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21603,8 +21669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21613,8 +21679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2382",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21623,8 +21689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2673",
-   "self_type" : "type-2672",
+   "referenced_type" : "type-2675",
+   "self_type" : "type-2674",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21633,8 +21699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2778",
-   "self_type" : "type-2777",
+   "referenced_type" : "type-2780",
+   "self_type" : "type-2779",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21643,8 +21709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2865",
-   "self_type" : "type-2864",
+   "referenced_type" : "type-2867",
+   "self_type" : "type-2866",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21653,8 +21719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2943",
-   "self_type" : "type-2942",
+   "referenced_type" : "type-2946",
+   "self_type" : "type-2945",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21663,8 +21729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3075",
-   "self_type" : "type-3074",
+   "referenced_type" : "type-3078",
+   "self_type" : "type-3077",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21673,8 +21739,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3172",
-   "self_type" : "type-3171",
+   "referenced_type" : "type-3176",
+   "self_type" : "type-3175",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21683,8 +21749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21693,8 +21759,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3240",
-   "self_type" : "type-3239",
+   "referenced_type" : "type-3243",
+   "self_type" : "type-3242",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21703,8 +21769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3280",
-   "self_type" : "type-3279",
+   "referenced_type" : "type-3283",
+   "self_type" : "type-3282",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21713,8 +21779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3331",
-   "self_type" : "type-3330",
+   "referenced_type" : "type-3334",
+   "self_type" : "type-3333",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21723,8 +21789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-3478",
-   "self_type" : "type-3477",
+   "referenced_type" : "type-3481",
+   "self_type" : "type-3480",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21733,8 +21799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21753,8 +21819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21763,8 +21829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21773,8 +21839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21783,8 +21849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21803,8 +21869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21813,8 +21879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1798",
-   "self_type" : "type-1797",
+   "referenced_type" : "type-1799",
+   "self_type" : "type-1798",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21823,8 +21889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1914",
+   "self_type" : "type-1913",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21833,8 +21899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1990",
+   "self_type" : "type-1989",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21843,8 +21909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2068",
-   "self_type" : "type-2067",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2070",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21853,8 +21919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2114",
-   "self_type" : "type-2113",
+   "referenced_type" : "type-2117",
+   "self_type" : "type-2116",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21863,8 +21929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2175",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2179",
+   "self_type" : "type-2178",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21873,8 +21939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21883,8 +21949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2668",
-   "self_type" : "type-2667",
+   "referenced_type" : "type-2671",
+   "self_type" : "type-2670",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21893,8 +21959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2774",
-   "self_type" : "type-2773",
+   "referenced_type" : "type-2776",
+   "self_type" : "type-2775",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21903,8 +21969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2861",
-   "self_type" : "type-2860",
+   "referenced_type" : "type-2863",
+   "self_type" : "type-2862",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21913,8 +21979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2939",
-   "self_type" : "type-2938",
+   "referenced_type" : "type-2941",
+   "self_type" : "type-2940",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21923,8 +21989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3069",
-   "self_type" : "type-3068",
+   "referenced_type" : "type-3074",
+   "self_type" : "type-3073",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21933,8 +21999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21943,8 +22009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3168",
-   "self_type" : "type-3167",
+   "referenced_type" : "type-3172",
+   "self_type" : "type-3171",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21953,8 +22019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3236",
-   "self_type" : "type-3235",
+   "referenced_type" : "type-3239",
+   "self_type" : "type-3238",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21963,8 +22029,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3276",
-   "self_type" : "type-3275",
+   "referenced_type" : "type-3279",
+   "self_type" : "type-3278",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21973,8 +22039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3327",
-   "self_type" : "type-3326",
+   "referenced_type" : "type-3330",
+   "self_type" : "type-3329",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21983,8 +22049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-3474",
-   "self_type" : "type-3473",
+   "referenced_type" : "type-3477",
+   "self_type" : "type-3476",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -21993,8 +22059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22003,8 +22069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22013,8 +22079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22023,8 +22089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22033,8 +22099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22063,8 +22129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22073,8 +22139,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1806",
-   "self_type" : "type-1805",
+   "referenced_type" : "type-1807",
+   "self_type" : "type-1806",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22083,8 +22149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1920",
-   "self_type" : "type-1919",
+   "referenced_type" : "type-1922",
+   "self_type" : "type-1921",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22093,8 +22159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1996",
-   "self_type" : "type-1995",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22103,8 +22169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2080",
+   "self_type" : "type-2079",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22113,8 +22179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2126",
+   "self_type" : "type-2125",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22123,8 +22189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22133,8 +22199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2386",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22143,8 +22209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2677",
-   "self_type" : "type-2676",
+   "referenced_type" : "type-2679",
+   "self_type" : "type-2678",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22153,8 +22219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2782",
-   "self_type" : "type-2781",
+   "referenced_type" : "type-2784",
+   "self_type" : "type-2783",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22163,8 +22229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2869",
-   "self_type" : "type-2868",
+   "referenced_type" : "type-2871",
+   "self_type" : "type-2870",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22173,8 +22239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2948",
-   "self_type" : "type-2947",
+   "referenced_type" : "type-2950",
+   "self_type" : "type-2949",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22183,8 +22249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3079",
-   "self_type" : "type-3078",
+   "referenced_type" : "type-3082",
+   "self_type" : "type-3081",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22193,8 +22259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3177",
-   "self_type" : "type-3176",
+   "referenced_type" : "type-3182",
+   "self_type" : "type-3181",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22203,8 +22269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3244",
-   "self_type" : "type-3243",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22213,8 +22279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-3247",
+   "self_type" : "type-3246",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22223,8 +22289,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3284",
-   "self_type" : "type-3283",
+   "referenced_type" : "type-3287",
+   "self_type" : "type-3286",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22233,8 +22299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3335",
-   "self_type" : "type-3334",
+   "referenced_type" : "type-3338",
+   "self_type" : "type-3337",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22243,8 +22309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-3482",
-   "self_type" : "type-3481",
+   "referenced_type" : "type-3485",
+   "self_type" : "type-3484",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22253,8 +22319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22263,8 +22329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22283,8 +22349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22293,8 +22359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -22303,8 +22369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22323,8 +22389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1814",
-   "self_type" : "type-1813",
+   "referenced_type" : "type-1815",
+   "self_type" : "type-1814",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22333,8 +22399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22343,8 +22409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2089",
+   "self_type" : "type-2088",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22353,8 +22419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2132",
-   "self_type" : "type-2131",
+   "referenced_type" : "type-2135",
+   "self_type" : "type-2134",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22363,8 +22429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22373,8 +22439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2398",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22383,8 +22449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2790",
-   "self_type" : "type-2789",
+   "referenced_type" : "type-2792",
+   "self_type" : "type-2791",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22393,8 +22459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2957",
-   "self_type" : "type-2956",
+   "referenced_type" : "type-2959",
+   "self_type" : "type-2958",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22403,8 +22469,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3187",
-   "self_type" : "type-3186",
+   "referenced_type" : "type-3190",
+   "self_type" : "type-3189",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22413,8 +22479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3252",
-   "self_type" : "type-3251",
+   "referenced_type" : "type-3255",
+   "self_type" : "type-3254",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22423,8 +22489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3292",
-   "self_type" : "type-3291",
+   "referenced_type" : "type-3295",
+   "self_type" : "type-3294",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22433,8 +22499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3343",
-   "self_type" : "type-3342",
+   "referenced_type" : "type-3346",
+   "self_type" : "type-3345",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22443,8 +22509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-3494",
-   "self_type" : "type-3493",
+   "referenced_type" : "type-3497",
+   "self_type" : "type-3496",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22453,8 +22519,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22463,8 +22529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22473,8 +22539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22483,8 +22549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22493,8 +22559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22513,8 +22579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1812",
-   "self_type" : "type-1811",
+   "referenced_type" : "type-1813",
+   "self_type" : "type-1812",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22523,8 +22589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2002",
-   "self_type" : "type-2001",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2003",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22533,8 +22599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22543,8 +22609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2130",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22553,8 +22619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2191",
-   "self_type" : "type-2190",
+   "referenced_type" : "type-2194",
+   "self_type" : "type-2193",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22563,8 +22629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2395",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2397",
+   "self_type" : "type-2396",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22573,8 +22639,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2788",
-   "self_type" : "type-2787",
+   "referenced_type" : "type-2790",
+   "self_type" : "type-2789",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22583,8 +22649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2955",
-   "self_type" : "type-2954",
+   "referenced_type" : "type-2957",
+   "self_type" : "type-2956",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22593,8 +22659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3185",
-   "self_type" : "type-3184",
+   "referenced_type" : "type-3188",
+   "self_type" : "type-3187",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22603,8 +22669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3250",
-   "self_type" : "type-3249",
+   "referenced_type" : "type-3253",
+   "self_type" : "type-3252",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22613,8 +22679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3290",
-   "self_type" : "type-3289",
+   "referenced_type" : "type-3293",
+   "self_type" : "type-3292",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22623,8 +22689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3341",
-   "self_type" : "type-3340",
+   "referenced_type" : "type-3344",
+   "self_type" : "type-3343",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22633,8 +22699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-3492",
-   "self_type" : "type-3491",
+   "referenced_type" : "type-3495",
+   "self_type" : "type-3494",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22643,8 +22709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22653,8 +22719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22663,8 +22729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22673,8 +22739,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22683,8 +22749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22703,8 +22769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1810",
-   "self_type" : "type-1809",
+   "referenced_type" : "type-1811",
+   "self_type" : "type-1810",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22713,8 +22779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2000",
-   "self_type" : "type-1999",
+   "referenced_type" : "type-2002",
+   "self_type" : "type-2001",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22723,8 +22789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2082",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22733,8 +22799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2128",
-   "self_type" : "type-2127",
+   "referenced_type" : "type-2131",
+   "self_type" : "type-2130",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22743,8 +22809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22753,8 +22819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2393",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2395",
+   "self_type" : "type-2394",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22763,8 +22829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2786",
-   "self_type" : "type-2785",
+   "referenced_type" : "type-2788",
+   "self_type" : "type-2787",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22773,8 +22839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2952",
-   "self_type" : "type-2951",
+   "referenced_type" : "type-2955",
+   "self_type" : "type-2954",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22783,8 +22849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3183",
-   "self_type" : "type-3182",
+   "referenced_type" : "type-3186",
+   "self_type" : "type-3185",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22793,8 +22859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3248",
-   "self_type" : "type-3247",
+   "referenced_type" : "type-3251",
+   "self_type" : "type-3250",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22803,8 +22869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3288",
-   "self_type" : "type-3287",
+   "referenced_type" : "type-3291",
+   "self_type" : "type-3290",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22813,8 +22879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3339",
-   "self_type" : "type-3338",
+   "referenced_type" : "type-3342",
+   "self_type" : "type-3341",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22823,8 +22889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-3490",
-   "self_type" : "type-3489",
+   "referenced_type" : "type-3493",
+   "self_type" : "type-3492",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22833,8 +22899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22843,8 +22909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22853,8 +22919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22863,8 +22929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22893,8 +22959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1808",
-   "self_type" : "type-1807",
+   "referenced_type" : "type-1809",
+   "self_type" : "type-1808",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22903,8 +22969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-2000",
+   "self_type" : "type-1999",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22913,8 +22979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22923,8 +22989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2125",
-   "self_type" : "type-2124",
+   "referenced_type" : "type-2128",
+   "self_type" : "type-2127",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22933,8 +22999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22943,8 +23009,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2392",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22953,8 +23019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2784",
-   "self_type" : "type-2783",
+   "referenced_type" : "type-2786",
+   "self_type" : "type-2785",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22963,8 +23029,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2950",
-   "self_type" : "type-2949",
+   "referenced_type" : "type-2953",
+   "self_type" : "type-2952",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22973,8 +23039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3181",
-   "self_type" : "type-3180",
+   "referenced_type" : "type-3184",
+   "self_type" : "type-3183",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22983,8 +23049,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3246",
-   "self_type" : "type-3245",
+   "referenced_type" : "type-3249",
+   "self_type" : "type-3248",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -22993,8 +23059,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3286",
-   "self_type" : "type-3285",
+   "referenced_type" : "type-3289",
+   "self_type" : "type-3288",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23003,8 +23069,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3337",
-   "self_type" : "type-3336",
+   "referenced_type" : "type-3340",
+   "self_type" : "type-3339",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23013,8 +23079,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-3488",
-   "self_type" : "type-3487",
+   "referenced_type" : "type-3491",
+   "self_type" : "type-3490",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23023,8 +23089,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23033,8 +23099,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23043,8 +23109,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23053,8 +23119,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23063,8 +23129,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23083,8 +23149,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1816",
-   "self_type" : "type-1815",
+   "referenced_type" : "type-1817",
+   "self_type" : "type-1816",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23093,8 +23159,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2006",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23103,8 +23169,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23113,8 +23179,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2137",
+   "self_type" : "type-2136",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23123,8 +23189,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23133,8 +23199,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2400",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23143,8 +23209,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2792",
-   "self_type" : "type-2791",
+   "referenced_type" : "type-2794",
+   "self_type" : "type-2793",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23153,8 +23219,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2959",
-   "self_type" : "type-2958",
+   "referenced_type" : "type-2962",
+   "self_type" : "type-2961",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23163,8 +23229,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3189",
-   "self_type" : "type-3188",
+   "referenced_type" : "type-3193",
+   "self_type" : "type-3192",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23173,8 +23239,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3254",
-   "self_type" : "type-3253",
+   "referenced_type" : "type-3257",
+   "self_type" : "type-3256",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23183,8 +23249,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3294",
-   "self_type" : "type-3293",
+   "referenced_type" : "type-3297",
+   "self_type" : "type-3296",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23193,8 +23259,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3345",
-   "self_type" : "type-3344",
+   "referenced_type" : "type-3348",
+   "self_type" : "type-3347",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23203,8 +23269,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-3496",
-   "self_type" : "type-3495",
+   "referenced_type" : "type-3499",
+   "self_type" : "type-3498",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23213,8 +23279,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23233,8 +23299,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23243,8 +23309,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -23253,8 +23319,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23263,8 +23329,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23273,8 +23339,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1774",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23283,8 +23349,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1898",
+   "self_type" : "type-1897",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23293,8 +23359,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1972",
+   "self_type" : "type-1971",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23303,8 +23369,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2050",
-   "self_type" : "type-2049",
+   "referenced_type" : "type-2052",
+   "self_type" : "type-2051",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23313,8 +23379,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2602",
-   "self_type" : "type-2601",
+   "referenced_type" : "type-2607",
+   "self_type" : "type-2606",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23323,8 +23389,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2839",
-   "self_type" : "type-2838",
+   "referenced_type" : "type-2841",
+   "self_type" : "type-2840",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23333,8 +23399,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2912",
-   "self_type" : "type-2911",
+   "referenced_type" : "type-2914",
+   "self_type" : "type-2913",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23343,8 +23409,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3052",
-   "self_type" : "type-3051",
+   "referenced_type" : "type-3055",
+   "self_type" : "type-3054",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23353,8 +23419,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3148",
-   "self_type" : "type-3147",
+   "referenced_type" : "type-3152",
+   "self_type" : "type-3151",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23363,8 +23429,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-3220",
-   "self_type" : "type-3219",
+   "referenced_type" : "type-3223",
+   "self_type" : "type-3222",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23373,8 +23439,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23383,8 +23449,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23393,8 +23459,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -23413,8 +23479,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23423,8 +23489,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2177",
+   "self_type" : "type-2176",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23433,8 +23499,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2735",
-   "self_type" : "type-2734",
+   "referenced_type" : "type-2737",
+   "self_type" : "type-2736",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23443,8 +23509,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-3073",
-   "self_type" : "type-3072",
+   "referenced_type" : "type-3070",
+   "self_type" : "type-3069",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -23453,8 +23519,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23463,8 +23529,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23473,8 +23539,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2727",
-   "self_type" : "type-2726",
+   "referenced_type" : "type-2729",
+   "self_type" : "type-2728",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23483,8 +23549,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2845",
-   "self_type" : "type-2844",
+   "referenced_type" : "type-2847",
+   "self_type" : "type-2846",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23493,8 +23559,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-3365",
-   "self_type" : "type-3364",
+   "referenced_type" : "type-3368",
+   "self_type" : "type-3367",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23503,8 +23569,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23513,8 +23579,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2045",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23523,8 +23589,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23533,8 +23599,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2730",
-   "self_type" : "type-2729",
+   "referenced_type" : "type-2732",
+   "self_type" : "type-2731",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23543,8 +23609,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-2915",
-   "self_type" : "type-2914",
+   "referenced_type" : "type-2917",
+   "self_type" : "type-2916",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23553,8 +23619,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-3367",
-   "self_type" : "type-3366",
+   "referenced_type" : "type-3370",
+   "self_type" : "type-3369",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23563,8 +23629,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -23583,8 +23649,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23593,8 +23659,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2747",
-   "self_type" : "type-2746",
+   "referenced_type" : "type-2749",
+   "self_type" : "type-2748",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23603,8 +23669,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-3192",
-   "self_type" : "type-3191",
+   "referenced_type" : "type-3195",
+   "self_type" : "type-3194",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -23613,8 +23679,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23623,8 +23689,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2519",
+   "self_type" : "type-2518",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23633,8 +23699,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2809",
-   "self_type" : "type-2808",
+   "referenced_type" : "type-2811",
+   "self_type" : "type-2810",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23643,8 +23709,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-3611",
-   "self_type" : "type-3610",
+   "referenced_type" : "type-3617",
+   "self_type" : "type-3616",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -23653,8 +23719,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2143",
-   "self_type" : "type-2142",
+   "referenced_type" : "type-2145",
+   "self_type" : "type-2144",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23663,8 +23729,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-3300",
-   "self_type" : "type-3299",
+   "referenced_type" : "type-3303",
+   "self_type" : "type-3302",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -23683,8 +23749,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23703,8 +23769,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23713,8 +23779,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23723,8 +23789,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23733,8 +23799,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1890",
+   "self_type" : "type-1889",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23743,8 +23809,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23753,8 +23819,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2021",
-   "self_type" : "type-2020",
+   "referenced_type" : "type-2024",
+   "self_type" : "type-2023",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23763,8 +23829,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2138",
-   "self_type" : "type-2137",
+   "referenced_type" : "type-2142",
+   "self_type" : "type-2141",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23773,8 +23839,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23783,8 +23849,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2419",
+   "self_type" : "type-2418",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23793,8 +23859,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2551",
-   "self_type" : "type-2550",
+   "referenced_type" : "type-2556",
+   "self_type" : "type-2555",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23803,8 +23869,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2682",
-   "self_type" : "type-2681",
+   "referenced_type" : "type-2684",
+   "self_type" : "type-2683",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23813,8 +23879,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2795",
-   "self_type" : "type-2794",
+   "referenced_type" : "type-2797",
+   "self_type" : "type-2796",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23823,8 +23889,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2821",
-   "self_type" : "type-2820",
+   "referenced_type" : "type-2823",
+   "self_type" : "type-2822",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23833,8 +23899,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2872",
-   "self_type" : "type-2871",
+   "referenced_type" : "type-2874",
+   "self_type" : "type-2873",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23843,8 +23909,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2963",
-   "self_type" : "type-2962",
+   "referenced_type" : "type-2965",
+   "self_type" : "type-2964",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23853,8 +23919,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3044",
-   "self_type" : "type-3043",
+   "referenced_type" : "type-3047",
+   "self_type" : "type-3046",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23863,8 +23929,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3119",
-   "self_type" : "type-3118",
+   "referenced_type" : "type-3123",
+   "self_type" : "type-3122",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23873,8 +23939,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3202",
-   "self_type" : "type-3201",
+   "referenced_type" : "type-3205",
+   "self_type" : "type-3204",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23883,8 +23949,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3297",
-   "self_type" : "type-3296",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23893,8 +23959,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-3300",
+   "self_type" : "type-3299",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23903,8 +23969,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3348",
-   "self_type" : "type-3347",
+   "referenced_type" : "type-3351",
+   "self_type" : "type-3350",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23913,8 +23979,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-3514",
-   "self_type" : "type-3513",
+   "referenced_type" : "type-3517",
+   "self_type" : "type-3516",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23923,8 +23989,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23933,8 +23999,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23953,8 +24019,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23963,8 +24029,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23973,8 +24039,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -23983,8 +24049,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -23993,8 +24059,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -24003,8 +24069,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -24022,7 +24088,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -24031,8 +24097,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -24042,7 +24108,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -24051,8 +24117,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -24065,48 +24131,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -24117,23 +24183,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -24144,18 +24210,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -24166,63 +24232,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -24233,22 +24299,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -24265,7 +24331,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -24301,20 +24367,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -24402,7 +24468,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -24509,14 +24575,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -24557,13 +24623,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -24575,14 +24641,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -24592,14 +24658,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -24609,13 +24675,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -24627,20 +24693,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -24652,20 +24718,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -24687,11 +24753,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -24699,11 +24765,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -24755,36 +24821,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -24794,7 +24860,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -24803,20 +24869,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -24853,7 +24919,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -24862,20 +24928,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -24933,10 +24999,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -24945,62 +25011,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1024,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1088,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1120,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1152,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 160,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -25040,7 +25106,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 192,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 256,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 288,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 48,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -25052,100 +25202,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 8,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 192,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 256,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 288,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 48,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -25200,17 +25266,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "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-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -25226,11 +25292,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -25238,11 +25304,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -25286,11 +25352,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2225",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2221" ],
+   "template_args" : [ "type-2224" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -25396,14 +25462,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -25415,14 +25481,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -25471,12 +25537,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -25495,14 +25561,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -25514,14 +25580,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -25533,14 +25599,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -25573,14 +25639,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -25620,8 +25686,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -25667,7 +25733,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2222"
+     "referenced_type" : "type-2225"
     }
    ],
    "fields" :
@@ -25675,14 +25741,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2213"
+     "referenced_type" : "type-2216"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2221",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2224",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -25694,7 +25760,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -25711,11 +25777,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -25723,11 +25789,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -25736,17 +25802,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "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-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -25794,7 +25860,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -25851,14 +25917,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -25916,14 +25982,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -25935,14 +26001,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -25953,7 +26019,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -25962,62 +26028,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -26107,14 +26173,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2216",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -26162,17 +26228,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -26217,17 +26283,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -26272,17 +26338,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -26327,17 +26393,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -26382,17 +26448,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -26439,32 +26505,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -26550,11 +26616,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -26574,7 +26640,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -26639,28 +26705,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2254"
+     "referenced_type" : "type-2257"
+    },
+    {
+     "referenced_type" : "type-2258"
     },
     {
      "referenced_type" : "type-2255"
     },
     {
-     "referenced_type" : "type-2252"
-    },
-    {
-     "referenced_type" : "type-2265"
-    },
-    {
-     "referenced_type" : "type-2268"
+     "referenced_type" : "type-2269"
     },
     {
      "referenced_type" : "type-2270"
     },
     {
-     "referenced_type" : "type-2269"
+     "referenced_type" : "type-2272"
     },
     {
-     "referenced_type" : "type-2272"
+     "referenced_type" : "type-2271"
+    },
+    {
+     "referenced_type" : "type-2274"
     }
    ],
    "fields" :
@@ -26668,14 +26734,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2277"
+     "referenced_type" : "type-2279"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2278",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -26698,8 +26764,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2274",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26722,8 +26788,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2271",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26746,8 +26812,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2269",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26770,8 +26836,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2270",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26794,8 +26860,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2272",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26806,11 +26872,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -26818,8 +26884,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26830,11 +26896,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -26842,8 +26908,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26854,11 +26920,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26878,38 +26944,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -26917,27 +26983,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -26948,29 +27014,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -26980,35 +27046,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -27019,27 +27085,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -27071,8 +27137,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -27082,16 +27148,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -27214,12 +27280,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -27230,22 +27290,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -27253,21 +27319,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -27278,19 +27344,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -27301,19 +27367,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -27324,19 +27390,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -27346,9 +27412,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -27362,19 +27425,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -27385,21 +27451,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -27421,8 +27487,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -27444,8 +27510,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -27467,8 +27533,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -27478,12 +27544,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -27494,22 +27554,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -27517,33 +27583,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -27554,24 +27620,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -27582,24 +27648,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -27610,24 +27676,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -27637,35 +27703,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -27676,33 +27742,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -27729,8 +27795,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -27757,8 +27823,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -27785,8 +27851,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -27796,12 +27862,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -27812,22 +27872,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -27835,45 +27901,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -27884,29 +27950,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -27917,29 +27983,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -27950,29 +28016,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -27982,35 +28048,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -28021,45 +28087,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -28091,8 +28157,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -28124,8 +28190,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -28157,8 +28223,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -28180,8 +28246,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2255",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28192,11 +28258,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28204,8 +28270,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28216,8 +28282,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28228,11 +28294,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28240,8 +28306,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28252,11 +28318,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28264,8 +28330,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28276,11 +28342,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28288,8 +28354,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28312,8 +28378,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2258",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28324,11 +28390,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28336,8 +28402,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28348,8 +28414,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28360,11 +28426,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28372,8 +28438,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28384,11 +28450,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28396,8 +28462,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28408,11 +28474,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28420,8 +28486,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28444,11 +28510,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -28456,8 +28522,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28468,11 +28534,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -28480,8 +28546,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28492,11 +28558,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -28504,8 +28570,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28528,11 +28594,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -28540,8 +28606,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28552,11 +28618,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -28564,8 +28630,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28576,11 +28642,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -28588,8 +28654,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28600,8 +28666,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28612,11 +28678,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28624,8 +28690,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28636,11 +28702,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28648,8 +28714,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28660,11 +28726,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28672,8 +28738,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28696,8 +28762,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2257",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28708,11 +28774,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -28720,8 +28786,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28732,8 +28798,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -28744,11 +28810,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -28756,8 +28822,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28768,11 +28834,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -28792,11 +28858,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -28804,8 +28870,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -28871,7 +28937,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -28893,7 +28959,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -28902,32 +28968,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -29034,7 +29100,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29043,26 +29109,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -29151,22 +29217,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -29187,7 +29253,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -29275,14 +29341,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -29392,14 +29458,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -29480,14 +29546,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -29569,85 +29635,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -29665,26 +29731,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -29696,73 +29762,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -29786,20 +29852,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -29811,23 +29877,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -29838,7 +29904,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -29847,55 +29913,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 256,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 320,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 352,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -29907,25 +29973,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 544,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 576,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 608,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 768,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -29943,26 +30009,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 832,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 864,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 896,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 128,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -30040,18 +30106,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -30061,7 +30127,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30070,17 +30136,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -30088,7 +30154,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30097,17 +30163,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -30115,7 +30181,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -30124,17 +30190,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -30142,7 +30208,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -30152,7 +30218,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -30162,26 +30228,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -30287,7 +30353,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -30301,12 +30367,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1099",
    "self_type" : "type-1099",
@@ -30338,16 +30404,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -30365,7 +30431,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -30375,16 +30441,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1072",
    "self_type" : "type-1072",
@@ -30398,16 +30464,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -30417,19 +30483,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -30441,19 +30507,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_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<hidl_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<hidl_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<hidl_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-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -30473,7 +30539,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -30487,12 +30553,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1151",
    "self_type" : "type-1151",
@@ -30506,16 +30572,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -30525,19 +30591,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned 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<unsigned 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<unsigned 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-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -30559,7 +30625,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -30571,8 +30637,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -30585,7 +30651,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -30599,7 +30665,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -30626,7 +30692,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -30635,7 +30701,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -30720,33 +30786,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -30756,7 +30822,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -30767,8 +30833,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -30780,13 +30846,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -30816,7 +30882,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30846,7 +30912,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30871,13 +30937,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30888,11 +30954,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -30902,13 +30968,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -30919,11 +30985,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -30956,23 +31022,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "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"
@@ -30983,13 +31049,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -31098,13 +31164,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "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",
@@ -31218,12 +31284,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -31232,7 +31298,7 @@
    "self_type" : "type-694",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31262,17 +31328,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -31282,17 +31348,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -31302,17 +31368,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -31322,17 +31388,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -31342,17 +31408,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -31362,17 +31428,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -31382,17 +31448,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -31402,17 +31468,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -31422,17 +31488,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -31442,17 +31508,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -31482,17 +31548,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "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-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -31502,36 +31568,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "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-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2237",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -31541,8 +31607,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31552,33 +31618,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31607,8 +31673,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -31618,8 +31684,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31629,11 +31695,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -31644,26 +31710,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -31673,11 +31739,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -31688,26 +31754,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -31717,22 +31783,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -31743,15 +31809,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -31761,8 +31827,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31772,11 +31838,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -31787,7 +31853,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -31827,8 +31893,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -31838,11 +31904,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -31853,18 +31919,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -31882,11 +31948,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -31897,18 +31963,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -31926,33 +31992,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -31970,8 +32036,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -31981,11 +32047,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -31996,7 +32062,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32036,8 +32102,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32047,11 +32113,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -32062,7 +32128,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -32073,7 +32139,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -32095,18 +32161,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -32117,7 +32183,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -32135,41 +32201,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32179,8 +32245,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -32190,22 +32256,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -32234,11 +32300,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -32249,15 +32315,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32267,8 +32333,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -32278,22 +32344,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -32304,7 +32370,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -32322,11 +32388,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -32337,18 +32403,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -32366,22 +32432,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -32392,15 +32458,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -32421,30 +32487,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2238",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32454,8 +32520,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32469,18 +32535,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -32489,12 +32555,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -32512,20 +32578,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2284"
+     "referenced_type" : "type-2287"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2286",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -32542,8 +32608,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2287",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -32553,13 +32619,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2209"
+     "referenced_type" : "type-2212"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2211",
+   "self_type" : "type-2211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -32570,13 +32636,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -32587,16 +32653,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -32627,12 +32693,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -32659,7 +32725,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -32681,7 +32747,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -32691,32 +32757,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -32733,33 +32799,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -32770,28 +32836,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -32866,43 +32932,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -32913,108 +32979,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -33025,63 +33091,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -33092,33 +33168,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -33129,13 +33205,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -33146,7 +33222,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -33161,38 +33237,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -33258,12 +33334,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -33290,22 +33366,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -33337,27 +33413,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33389,27 +33465,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33441,32 +33517,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -33488,28 +33564,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -33519,13 +33595,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33536,8 +33612,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -33550,8 +33626,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -33577,8 +33653,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33586,8 +33662,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33595,8 +33671,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -33613,7 +33689,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33622,7 +33698,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -33631,7 +33707,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -33650,7 +33726,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33658,8 +33734,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33667,8 +33743,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33676,8 +33752,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33685,8 +33761,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33694,8 +33770,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -33703,7 +33779,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/x86/source-based/libui.so.lsdump b/29/64/x86/source-based/libui.so.lsdump
index ba6360c..8848d82 100644
--- a/29/64/x86/source-based/libui.so.lsdump
+++ b/29/64/x86/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -177,8 +168,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -187,16 +178,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -212,8 +203,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -221,16 +212,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -238,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -266,8 +257,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -276,8 +267,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -296,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -313,8 +304,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1805,11 +1796,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1971,11 +1962,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1993,11 +1984,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2023,7 +2014,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2045,11 +2036,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2072,11 +2063,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2102,11 +2093,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2124,11 +2115,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2142,11 +2133,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2160,11 +2151,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2182,7 +2173,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2196,11 +2187,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2214,11 +2205,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2232,11 +2223,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2254,7 +2245,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2272,7 +2263,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2290,7 +2281,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2308,7 +2299,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2322,11 +2313,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2340,11 +2331,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2358,11 +2349,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2377,11 +2368,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2407,7 +2398,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2429,7 +2420,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2451,11 +2442,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2509,7 +2500,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2563,7 +2554,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2665,11 +2656,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2723,7 +2714,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2765,7 +2756,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3007,7 +2998,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3033,7 +3024,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3127,7 +3118,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3161,7 +3152,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3271,11 +3262,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3341,7 +3332,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3599,7 +3590,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3721,7 +3712,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3751,7 +3742,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3865,11 +3856,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3939,7 +3930,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4213,7 +4204,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4243,7 +4234,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4369,7 +4360,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4391,11 +4382,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "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-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4433,11 +4424,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4467,11 +4458,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4521,7 +4512,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4575,7 +4566,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4601,7 +4592,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4643,7 +4634,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4885,7 +4876,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4915,7 +4906,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4945,7 +4936,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4987,7 +4978,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5025,7 +5016,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5051,7 +5042,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5069,7 +5060,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5099,7 +5090,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5193,7 +5184,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5235,7 +5226,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5253,7 +5244,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5283,7 +5274,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5317,7 +5308,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5371,7 +5362,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5384,18 +5375,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5408,11 +5399,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5426,26 +5417,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5456,15 +5447,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5474,18 +5465,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5495,33 +5486,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5531,36 +5522,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5570,33 +5561,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5606,36 +5597,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5645,15 +5693,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5663,18 +5711,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5684,12 +5732,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5699,15 +5747,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5717,15 +5765,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5735,24 +5783,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5762,12 +5810,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5777,12 +5825,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5795,14 +5843,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5813,27 +5861,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5843,12 +5891,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5858,18 +5906,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5884,7 +5932,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5896,7 +5944,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5908,7 +5956,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5920,7 +5968,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5932,7 +5980,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5941,10 +5989,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5956,7 +6004,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5968,7 +6016,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5980,7 +6028,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6067,7 +6115,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6076,7 +6124,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6086,10 +6134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6098,14 +6146,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6115,10 +6163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6128,18 +6176,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6149,10 +6197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6165,10 +6213,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6178,23 +6226,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6204,28 +6252,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6235,23 +6283,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6261,10 +6309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6273,14 +6321,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6290,10 +6338,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6303,18 +6351,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6324,10 +6372,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6340,10 +6388,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6353,23 +6401,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6379,28 +6427,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6410,23 +6458,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6436,16 +6484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6454,10 +6502,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6467,10 +6515,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6480,13 +6528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6496,25 +6544,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6525,10 +6573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6538,13 +6586,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6555,28 +6603,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6587,34 +6635,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6624,19 +6672,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6646,22 +6694,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6671,16 +6719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6690,22 +6738,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6718,10 +6766,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6730,10 +6778,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6745,13 +6793,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6763,7 +6811,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,24 +6821,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6800,27 +6848,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6830,10 +6878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6891,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,30 +6921,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6906,33 +6954,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6942,16 +6990,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6961,19 +7009,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6983,7 +7031,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -6998,7 +7046,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7008,34 +7056,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7045,26 +7093,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7074,25 +7122,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7101,7 +7149,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7111,29 +7159,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7143,10 +7191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7156,34 +7204,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7193,26 +7241,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7222,25 +7270,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7249,7 +7297,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7259,29 +7307,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7291,10 +7339,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7305,10 +7353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7319,10 +7367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7333,10 +7381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7345,16 +7393,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7364,10 +7412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7377,10 +7425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7396,10 +7444,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7415,7 +7463,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7431,7 +7479,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7444,7 +7492,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7457,7 +7505,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7483,13 +7531,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7499,13 +7547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7524,7 +7572,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7543,7 +7591,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7553,16 +7601,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7573,10 +7621,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7586,13 +7634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7602,19 +7650,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7624,28 +7672,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7655,16 +7703,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7674,34 +7722,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7711,25 +7759,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7739,19 +7787,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7761,30 +7809,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7794,13 +7842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7810,33 +7858,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7846,36 +7894,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7885,22 +7933,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7911,10 +7959,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7925,10 +7973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7937,16 +7985,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7956,13 +8004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7972,93 +8020,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8071,7 +8119,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8084,7 +8132,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8094,7 +8142,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8103,7 +8151,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8113,7 +8161,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8128,7 +8176,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8138,10 +8186,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8150,7 +8198,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8160,10 +8208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8199,13 +8247,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8215,13 +8263,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8231,10 +8279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8244,13 +8292,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8260,13 +8308,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8276,10 +8324,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8289,10 +8337,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8302,10 +8350,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8315,13 +8363,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2442",
+   "return_type" : "type-2444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8334,7 +8382,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8347,16 +8395,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8372,10 +8420,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8391,10 +8439,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8410,10 +8458,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8426,10 +8474,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8438,7 +8486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8456,7 +8504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8490,7 +8538,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8506,7 +8554,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8519,10 +8567,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8538,7 +8586,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8551,10 +8599,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8564,13 +8612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8580,13 +8628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8596,19 +8644,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8619,16 +8667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,22 +8687,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8665,16 +8713,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8684,16 +8732,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8703,10 +8751,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8716,22 +8764,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8741,19 +8789,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8763,25 +8811,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8791,19 +8839,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8813,25 +8861,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8840,10 +8888,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8853,13 +8901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8869,16 +8917,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8888,16 +8936,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8907,10 +8955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8920,13 +8968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8936,13 +8984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8952,19 +9000,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8974,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8990,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9006,19 +9054,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9028,13 +9076,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9044,13 +9092,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9060,19 +9108,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9082,10 +9130,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9102,7 +9150,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-10"
@@ -9111,7 +9159,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9121,19 +9169,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9143,16 +9191,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9162,16 +9210,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9181,13 +9229,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9197,13 +9245,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9213,10 +9261,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9226,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9242,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9258,10 +9306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9271,10 +9319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9284,10 +9332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9297,13 +9345,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9313,10 +9361,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9326,13 +9374,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9342,13 +9390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9358,7 +9406,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9373,7 +9421,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9383,13 +9431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9399,13 +9447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9415,13 +9463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9431,13 +9479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9447,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9463,13 +9511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9480,7 +9528,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9489,7 +9537,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9499,13 +9547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9515,13 +9563,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9531,13 +9579,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9548,7 +9596,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9557,7 +9605,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9567,25 +9615,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9595,7 +9643,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9608,10 +9656,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9621,16 +9669,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9650,7 +9698,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9664,13 +9712,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9684,13 +9732,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9704,16 +9752,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,16 +9775,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9750,16 +9798,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9773,16 +9821,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9792,10 +9840,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9805,28 +9853,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9836,7 +9884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9849,10 +9897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9862,7 +9910,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9875,7 +9923,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9890,7 +9938,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9900,10 +9948,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9913,13 +9961,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9929,28 +9977,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9960,16 +10008,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9979,16 +10027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9998,19 +10046,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10020,31 +10068,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10055,13 +10103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10071,25 +10119,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10099,31 +10147,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10133,13 +10181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10149,7 +10197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10162,10 +10210,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10175,16 +10223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10194,10 +10242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10207,34 +10255,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10244,7 +10292,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10257,10 +10305,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10270,13 +10318,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10286,13 +10334,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10305,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-6",
@@ -10318,10 +10366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10331,7 +10379,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10344,7 +10392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10357,7 +10405,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10370,7 +10418,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10383,13 +10431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10399,16 +10447,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
-    },
-    {
      "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2445"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10419,10 +10467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10432,10 +10480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10445,10 +10493,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10458,10 +10506,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2427",
+   "return_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10471,7 +10519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1246"
@@ -10491,13 +10539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10507,13 +10555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10523,13 +10571,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10539,7 +10587,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1280"
@@ -10555,16 +10603,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10574,10 +10622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10590,13 +10638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10644,13 +10692,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10714,7 +10762,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10727,7 +10775,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10740,7 +10788,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10753,7 +10801,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10778,7 +10826,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10788,13 +10836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10820,19 +10868,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10842,10 +10890,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10855,10 +10903,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-6",
@@ -10871,7 +10919,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10884,17 +10932,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10904,20 +10952,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10927,7 +10975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10940,13 +10988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,13 +11004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10972,19 +11020,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10994,16 +11042,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11013,7 +11061,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1284"
@@ -11029,13 +11077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11048,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11064,13 +11112,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,13 +11128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11096,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11150,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11173,16 +11221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,22 +11241,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11219,16 +11267,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11238,16 +11286,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11258,16 +11306,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11278,16 +11326,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11298,19 +11346,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,19 +11369,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11344,19 +11392,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11367,19 +11415,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11389,10 +11437,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11402,10 +11450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11415,7 +11463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11428,10 +11476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11441,10 +11489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11454,7 +11502,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11469,24 +11517,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11522,41 +11570,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2388",
+   "referenced_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11566,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11575,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11584,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11593,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11611,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11629,8 +11677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11647,8 +11695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11656,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11665,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11674,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11692,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11701,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11710,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11728,7 +11776,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11737,7 +11785,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11746,7 +11794,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11755,7 +11803,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11764,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11773,8 +11821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11782,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11791,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11800,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11818,7 +11866,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11827,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11836,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11845,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11854,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11863,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11872,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11890,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11909,7 +11957,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11917,8 +11965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11926,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11935,8 +11983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11944,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11953,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11962,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11986,50 +12034,50 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2167",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2054",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2428",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12045,7 +12093,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12054,8 +12102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12063,8 +12111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12081,8 +12129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12090,8 +12138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12099,8 +12147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12108,8 +12156,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2230",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12126,8 +12174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12135,8 +12183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12145,7 +12193,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12153,8 +12201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12180,8 +12228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12189,8 +12237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12198,8 +12246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12207,8 +12255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12216,8 +12264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12225,8 +12273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12234,8 +12282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12243,8 +12291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12297,8 +12345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12306,8 +12354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12315,8 +12363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12378,8 +12426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12397,7 +12445,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12414,8 +12462,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12423,8 +12471,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12450,8 +12498,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12459,7 +12507,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12468,7 +12516,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12477,7 +12525,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12492,30 +12540,30 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2209",
+   "referenced_type" : "type-2207",
    "self_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12538,106 +12586,106 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1789",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2344",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12650,15 +12698,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12697,8 +12745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12706,8 +12754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12716,7 +12764,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12733,8 +12781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12742,8 +12790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12751,8 +12799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12760,8 +12808,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-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12769,7 +12817,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2103",
+   "referenced_type" : "type-2099",
    "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12787,8 +12835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12796,8 +12844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12805,8 +12853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12814,8 +12862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12823,8 +12871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2669",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2674",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12832,8 +12880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12850,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12868,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12877,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12886,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12895,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12904,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12913,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1992",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12922,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12931,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12940,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12949,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12958,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12967,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2565",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12976,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12985,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12994,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13012,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13021,8 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13030,8 +13078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13039,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13048,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13057,7 +13105,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13067,7 +13115,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13093,7 +13141,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13102,7 +13150,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13111,8 +13159,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13120,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13129,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13138,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13147,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13156,8 +13204,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-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2150",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13165,8 +13213,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-2396",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13174,8 +13222,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-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13183,8 +13231,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-2449",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13201,7 +13249,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13210,7 +13258,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13219,7 +13267,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13231,8 +13279,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13240,8 +13288,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13249,7 +13297,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13276,8 +13324,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13285,8 +13333,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13294,8 +13342,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13303,8 +13351,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2653",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13321,8 +13369,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13330,8 +13378,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13339,8 +13387,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13348,8 +13396,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13357,8 +13405,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2678",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13375,8 +13423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13385,7 +13433,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13402,8 +13450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13420,8 +13468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13429,8 +13477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13438,8 +13486,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13447,8 +13495,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13465,8 +13513,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13474,8 +13522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13483,8 +13531,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13492,8 +13540,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13501,8 +13549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13510,8 +13558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13528,8 +13576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13537,8 +13585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13546,8 +13594,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13555,8 +13603,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13564,8 +13612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13573,8 +13621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13583,7 +13631,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13600,8 +13648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13609,8 +13657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13627,8 +13675,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13636,8 +13684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13645,8 +13693,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13663,8 +13711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13672,8 +13720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13699,8 +13747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13708,8 +13756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13765,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13726,8 +13774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13735,8 +13783,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +13792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13753,8 +13801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13762,8 +13810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13771,8 +13819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13780,8 +13828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13789,8 +13837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13798,8 +13846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13807,8 +13855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13816,8 +13864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13825,8 +13873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13834,8 +13882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13843,8 +13891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13852,8 +13900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13861,8 +13909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13870,8 +13918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13879,8 +13927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13888,8 +13936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13915,8 +13963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13933,8 +13981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13960,8 +14008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13978,8 +14026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13987,8 +14035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13996,8 +14044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14032,8 +14080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14042,7 +14090,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14050,8 +14098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14059,8 +14107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14068,8 +14116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14086,7 +14134,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14095,7 +14143,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14104,7 +14152,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14113,8 +14161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14122,8 +14170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14131,8 +14179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14140,7 +14188,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14149,7 +14197,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14158,7 +14206,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14167,7 +14215,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14177,7 +14225,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14203,8 +14251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14221,8 +14269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14230,8 +14278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14239,8 +14287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14248,8 +14296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14257,8 +14305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14266,8 +14314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14284,7 +14332,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14311,8 +14359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14320,7 +14368,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14329,8 +14377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14338,8 +14386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14347,8 +14395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14356,8 +14404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14365,8 +14413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14374,8 +14422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14383,8 +14431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14401,8 +14449,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14419,8 +14467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14428,8 +14476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14437,8 +14485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14446,8 +14494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14455,8 +14503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14464,8 +14512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14473,8 +14521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14482,8 +14530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14491,8 +14539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14500,8 +14548,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14509,8 +14557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14545,8 +14593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14554,8 +14602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14563,8 +14611,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14572,8 +14620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14581,8 +14629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14617,8 +14665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14626,8 +14674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14635,8 +14683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14644,8 +14692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14653,8 +14701,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14662,8 +14710,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14671,8 +14719,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14680,8 +14728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14698,8 +14746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14725,8 +14773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14743,8 +14791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14761,8 +14809,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14770,8 +14818,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,7 +14828,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14797,8 +14845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14806,8 +14854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14815,8 +14863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14824,8 +14872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14833,8 +14881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14842,8 +14890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14851,8 +14899,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-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14869,8 +14917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14878,8 +14926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14896,8 +14944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14905,8 +14953,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14914,8 +14962,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-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14924,7 +14972,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14932,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14941,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14959,7 +15007,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -14968,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15004,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15013,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15031,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15040,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15049,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15058,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15067,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15076,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15085,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15094,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15103,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15157,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15175,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15184,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15193,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15202,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15211,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15229,7 +15277,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15257,7 +15305,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15265,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -15292,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15301,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15310,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15319,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15346,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15355,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15373,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15382,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15391,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15400,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15409,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15418,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15427,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15436,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15445,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15454,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15463,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15472,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15481,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15490,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15499,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15508,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15526,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15535,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15544,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15562,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15571,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15589,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "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/IBase.h"
   },
@@ -15598,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -15608,7 +15656,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15625,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15679,8 +15727,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-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15688,8 +15736,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-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15706,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15715,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15724,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15733,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15742,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15751,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15760,7 +15808,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15779,7 +15827,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15787,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15796,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15805,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15814,7 +15862,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15823,8 +15871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15841,8 +15889,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15850,8 +15898,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15859,8 +15907,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15868,8 +15916,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15877,8 +15925,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15904,8 +15952,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15913,42 +15961,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -15956,8 +15968,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -15965,10 +15977,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15976,8 +16042,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15985,8 +16051,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15994,8 +16060,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16003,8 +16069,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16012,8 +16078,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16021,8 +16087,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16030,8 +16096,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16048,8 +16114,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16057,7 +16123,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16066,8 +16132,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16075,8 +16141,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16084,8 +16150,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16102,8 +16168,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-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16111,8 +16177,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16120,8 +16186,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16129,8 +16195,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16138,8 +16204,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16151,8 +16217,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16181,8 +16247,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16191,8 +16257,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16201,8 +16267,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16211,8 +16277,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16221,8 +16287,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16231,8 +16297,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16241,8 +16307,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16251,8 +16317,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16261,8 +16327,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16271,8 +16337,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16281,8 +16347,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16291,8 +16357,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2168",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16301,8 +16367,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16311,8 +16377,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16321,8 +16387,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16331,8 +16397,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16341,8 +16407,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16351,8 +16417,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16361,8 +16427,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16371,8 +16437,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16381,8 +16447,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16391,8 +16457,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16421,8 +16487,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16438,32 +16504,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16479,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16488,32 +16554,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16521,8 +16587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16542,7 +16608,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16571,8 +16637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16581,8 +16647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16591,8 +16657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16601,8 +16667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16621,8 +16687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16631,8 +16697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16641,8 +16707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16651,8 +16717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16661,8 +16727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16671,8 +16737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16691,8 +16757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16701,8 +16767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16711,8 +16777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16721,8 +16787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16731,7 +16797,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16741,8 +16807,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16752,7 +16818,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -16761,8 +16827,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16772,7 +16838,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2397",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16821,7 +16887,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16831,8 +16897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16851,8 +16917,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16861,8 +16927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16871,8 +16937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2386",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16881,8 +16947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16891,8 +16957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16912,7 +16978,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16921,8 +16987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2433",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16931,8 +16997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16941,8 +17007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16961,7 +17027,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16971,7 +17037,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -16981,7 +17047,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -16991,7 +17057,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17001,8 +17067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17011,8 +17077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17022,7 +17088,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17051,8 +17117,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17061,8 +17127,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17071,8 +17137,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17081,8 +17147,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17091,8 +17157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17101,7 +17167,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17121,8 +17187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17131,8 +17197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17141,7 +17207,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17151,8 +17217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17161,8 +17227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17171,8 +17237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17181,8 +17247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17257,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17201,8 +17267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17271,8 +17337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17321,8 +17387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17371,8 +17437,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17381,8 +17447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17391,8 +17457,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17401,8 +17467,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17411,8 +17477,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +17487,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17431,8 +17497,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17441,8 +17507,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17461,8 +17527,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17471,8 +17537,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17481,8 +17547,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17491,7 +17557,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17521,8 +17587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17531,8 +17597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17551,8 +17617,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-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "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"
   },
@@ -17561,8 +17627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17571,8 +17637,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-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "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"
   },
@@ -17601,8 +17667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17611,8 +17677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17621,8 +17687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17631,8 +17697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17641,8 +17707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17651,8 +17717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17661,8 +17727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17681,8 +17747,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-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17691,8 +17757,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-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17711,8 +17777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2439",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17721,8 +17787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2447",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17732,7 +17798,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17741,8 +17807,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17751,8 +17817,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17761,8 +17827,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17772,7 +17838,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17788,24 +17854,24 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17813,8 +17879,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17823,8 +17889,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17833,8 +17899,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17850,120 +17916,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17978,16 +18044,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18021,7 +18087,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18031,8 +18097,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18041,8 +18107,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18052,7 +18118,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18081,8 +18147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18091,8 +18157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18111,8 +18177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18121,8 +18187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18131,8 +18197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18141,8 +18207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18151,8 +18217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18161,8 +18227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18171,8 +18237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18181,8 +18247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18191,8 +18257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18201,8 +18267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18211,8 +18277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18221,8 +18287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18241,8 +18307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18251,8 +18317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18261,8 +18327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18281,8 +18347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18301,8 +18367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18311,8 +18377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18321,8 +18387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18331,8 +18397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18341,8 +18407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18351,8 +18417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18361,8 +18427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18371,8 +18437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2302",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18381,8 +18447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18391,8 +18457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18401,8 +18467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18411,8 +18477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18421,8 +18487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18441,8 +18507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18451,8 +18517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18461,8 +18527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18481,8 +18547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18491,8 +18557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18501,8 +18567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18511,8 +18577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18521,8 +18587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18531,8 +18597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18541,8 +18607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18551,8 +18617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18561,8 +18627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2353",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18571,8 +18637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18581,8 +18647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18591,8 +18657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18601,8 +18667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18621,8 +18687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18631,8 +18697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18651,8 +18717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18661,8 +18727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18671,8 +18737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18681,8 +18747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18691,8 +18757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18701,8 +18767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18711,8 +18777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18721,8 +18787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18731,8 +18797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18741,8 +18807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18751,8 +18817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18761,8 +18827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18771,8 +18837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18781,8 +18847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18791,8 +18857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18801,8 +18867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18821,8 +18887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18841,8 +18907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18851,8 +18917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18861,8 +18927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18871,8 +18937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18881,8 +18947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18891,8 +18957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18901,8 +18967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18911,8 +18977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18921,8 +18987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18931,8 +18997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18941,8 +19007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18951,8 +19017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18981,8 +19047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18991,8 +19057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19011,8 +19077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19021,8 +19087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19031,8 +19097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19041,8 +19107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19051,8 +19117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +19127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2185",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +19137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2254",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +19147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +19157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +19167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +19177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +19187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19131,8 +19197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19151,8 +19217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19161,8 +19227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19191,8 +19257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19201,8 +19267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19211,8 +19277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19221,8 +19287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19231,8 +19297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19241,8 +19307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19251,8 +19317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19261,8 +19327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19271,8 +19337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2349",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19281,8 +19347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19291,8 +19357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19301,8 +19367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19321,8 +19387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19331,8 +19397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19341,8 +19407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19361,8 +19427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19381,8 +19447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19391,8 +19457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19401,8 +19467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19411,8 +19477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19421,8 +19487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19431,8 +19497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19441,8 +19507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19451,8 +19517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19461,8 +19527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2360",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19471,8 +19537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19481,8 +19547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19491,8 +19557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19501,8 +19567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19511,8 +19577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19521,8 +19587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19531,8 +19597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19541,8 +19607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19561,8 +19627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19571,8 +19637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19581,8 +19647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19591,8 +19657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19601,8 +19667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19611,8 +19677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19621,8 +19687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2274",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19631,8 +19697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19641,8 +19707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19651,8 +19717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19661,8 +19727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19671,8 +19737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19681,8 +19747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19701,8 +19767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19711,8 +19777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19721,8 +19787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19741,8 +19807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19751,8 +19817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19761,8 +19827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19771,8 +19837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19781,8 +19847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19791,8 +19857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19801,8 +19867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19811,8 +19877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19821,8 +19887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19831,8 +19897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19841,8 +19907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19851,8 +19917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19871,8 +19937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19881,8 +19947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19891,8 +19957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19901,8 +19967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19921,8 +19987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19931,8 +19997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19941,8 +20007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19951,8 +20017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19961,8 +20027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19971,8 +20037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19981,8 +20047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19991,8 +20057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20001,8 +20067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20011,8 +20077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20021,8 +20087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20031,8 +20097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20041,8 +20107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20051,8 +20117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20061,8 +20127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20071,8 +20137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20101,8 +20167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20111,8 +20177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20121,8 +20187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20131,8 +20197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20141,8 +20207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20151,8 +20217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20161,8 +20227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20171,8 +20237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2316",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20181,8 +20247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20191,8 +20257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20201,8 +20267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20211,8 +20277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20221,8 +20287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20241,8 +20307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20251,8 +20317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20261,8 +20327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20281,8 +20347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20291,8 +20357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20301,8 +20367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20311,8 +20377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2284",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20321,8 +20387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20331,8 +20397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20341,8 +20407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20351,8 +20417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20361,8 +20427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20371,8 +20437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20381,8 +20447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20391,8 +20457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20411,8 +20477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20421,8 +20487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20431,8 +20497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20441,8 +20507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20451,8 +20517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20461,8 +20527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20471,8 +20537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20481,8 +20547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20491,8 +20557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20501,8 +20567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20511,8 +20577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20521,8 +20587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20541,8 +20607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20551,8 +20617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1984",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20561,8 +20627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2215",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20571,8 +20637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2280",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20581,8 +20647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2320",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20591,8 +20657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20601,8 +20667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20611,8 +20677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20621,8 +20687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20631,8 +20697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20641,8 +20707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20671,8 +20737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20681,8 +20747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20691,8 +20757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20701,8 +20767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20711,8 +20777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20721,8 +20787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20731,8 +20797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20741,8 +20807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20751,8 +20817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20761,8 +20827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20771,8 +20837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20781,8 +20847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20801,8 +20867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20811,8 +20877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20821,8 +20887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20831,8 +20897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20841,8 +20907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20851,8 +20917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20861,8 +20927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20871,8 +20937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20891,8 +20957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20901,8 +20967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20911,8 +20977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20921,8 +20987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20931,8 +20997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20941,8 +21007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20951,8 +21017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20961,8 +21027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2181",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20971,8 +21037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20981,8 +21047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20991,8 +21057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21001,8 +21067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21021,8 +21087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21031,8 +21097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21041,8 +21107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21051,8 +21117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21061,8 +21127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21071,46 +21137,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2405",
    "self_type" : "type-2404",
    "size" : 4,
@@ -21119,10 +21145,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21141,8 +21207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21151,8 +21217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21161,8 +21227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21171,8 +21237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21181,8 +21247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21191,8 +21257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21211,8 +21277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21231,8 +21297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21241,8 +21307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21251,8 +21317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21261,8 +21327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21271,8 +21337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21281,8 +21347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21291,8 +21357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21301,8 +21367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21311,8 +21377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21321,8 +21387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21331,8 +21397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21341,8 +21407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21351,8 +21417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21361,8 +21427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21371,8 +21437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21391,8 +21457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21401,8 +21467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21411,8 +21477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21421,8 +21487,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21431,8 +21497,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21441,8 +21507,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21460,7 +21526,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21469,8 +21535,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21480,7 +21546,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21489,8 +21555,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21503,48 +21569,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21555,23 +21621,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21582,18 +21648,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21604,63 +21670,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21671,22 +21737,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21703,7 +21769,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -21739,20 +21805,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21840,7 +21906,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -21947,14 +22013,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -21995,13 +22061,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22013,14 +22079,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22030,14 +22096,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22047,13 +22113,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22065,20 +22131,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22090,20 +22156,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22125,11 +22191,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22137,11 +22203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22193,36 +22259,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22232,7 +22298,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -22241,20 +22307,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22291,7 +22357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -22300,20 +22366,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22371,10 +22437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -22383,62 +22449,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 992,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1056,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1088,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1120,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22478,7 +22544,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 160,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 224,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 256,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 44,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -22490,100 +22640,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 160,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 224,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 256,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 44,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22638,17 +22704,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "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-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22664,11 +22730,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22676,11 +22742,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22724,11 +22790,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2389" ],
+   "template_args" : [ "type-2391" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22834,14 +22900,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22853,14 +22919,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22909,12 +22975,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22933,14 +22999,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22952,14 +23018,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22971,14 +23037,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23011,14 +23077,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23058,8 +23124,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23105,7 +23171,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2392"
     }
    ],
    "fields" :
@@ -23113,14 +23179,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23132,7 +23198,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23149,11 +23215,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23161,11 +23227,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23174,17 +23240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "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-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23232,7 +23298,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -23289,14 +23355,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23354,14 +23420,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23373,14 +23439,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23391,7 +23457,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -23400,62 +23466,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23545,14 +23611,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23600,17 +23666,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23655,17 +23721,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23710,17 +23776,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23765,17 +23831,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23820,17 +23886,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -23877,32 +23943,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -23988,11 +24054,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24012,7 +24078,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24077,28 +24143,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2410"
+     "referenced_type" : "type-2412"
+    },
+    {
+     "referenced_type" : "type-2413"
     },
     {
      "referenced_type" : "type-2411"
     },
     {
-     "referenced_type" : "type-2409"
-    },
-    {
-     "referenced_type" : "type-2417"
-    },
-    {
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2420"
     },
     {
      "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     },
     {
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2422"
+    },
+    {
+     "referenced_type" : "type-2425"
     }
    ],
    "fields" :
@@ -24106,14 +24172,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24136,8 +24202,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2425",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24160,8 +24226,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24184,8 +24250,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24208,8 +24274,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24232,8 +24298,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24244,11 +24310,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24256,8 +24322,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24268,11 +24334,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24280,8 +24346,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24292,11 +24358,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24316,38 +24382,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24355,27 +24421,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24386,29 +24452,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24418,35 +24484,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24457,27 +24523,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24509,8 +24575,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24520,16 +24586,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -24652,12 +24718,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -24668,22 +24728,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -24691,21 +24757,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24716,19 +24782,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24739,19 +24805,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24762,19 +24828,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24784,9 +24850,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -24800,19 +24863,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -24823,21 +24889,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -24859,8 +24925,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -24882,8 +24948,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -24905,8 +24971,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -24916,12 +24982,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -24932,22 +24992,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -24955,33 +25021,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -24992,24 +25058,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25020,24 +25086,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25048,24 +25114,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25075,35 +25141,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -25114,33 +25180,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -25167,8 +25233,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -25195,8 +25261,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -25223,8 +25289,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -25234,12 +25300,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -25250,22 +25310,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25273,45 +25339,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25322,29 +25388,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25355,29 +25421,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25388,29 +25454,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25420,35 +25486,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25459,45 +25525,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25529,8 +25595,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25562,8 +25628,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25595,8 +25661,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25618,8 +25684,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25630,11 +25696,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25642,8 +25708,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25654,8 +25720,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25666,11 +25732,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25678,8 +25744,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25690,11 +25756,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25702,8 +25768,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25714,11 +25780,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25726,8 +25792,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25750,8 +25816,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25762,11 +25828,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25774,8 +25840,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25786,8 +25852,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25798,11 +25864,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25810,8 +25876,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25822,11 +25888,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25834,8 +25900,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25846,11 +25912,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25858,8 +25924,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25882,11 +25948,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25894,8 +25960,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25906,11 +25972,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25918,8 +25984,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25930,11 +25996,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25942,8 +26008,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25966,11 +26032,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -25978,8 +26044,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25990,11 +26056,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26002,8 +26068,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26014,11 +26080,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26026,8 +26092,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26038,8 +26104,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26050,11 +26116,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26062,8 +26128,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26074,11 +26140,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26086,8 +26152,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26098,11 +26164,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26110,8 +26176,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26134,8 +26200,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26146,11 +26212,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26158,8 +26224,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26170,8 +26236,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26182,11 +26248,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26194,8 +26260,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26206,11 +26272,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26230,11 +26296,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26242,8 +26308,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26309,7 +26375,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26331,7 +26397,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -26340,32 +26406,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26472,7 +26538,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -26481,26 +26547,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26589,22 +26655,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26625,7 +26691,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26713,14 +26779,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26830,14 +26896,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26918,14 +26984,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27007,85 +27073,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -27103,26 +27169,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27134,73 +27200,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -27224,20 +27290,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27249,23 +27315,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 32,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 96,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27276,7 +27342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -27285,55 +27351,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -27345,25 +27411,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -27381,26 +27447,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27478,18 +27544,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27499,7 +27565,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27508,17 +27574,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27526,7 +27592,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27535,17 +27601,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27553,7 +27619,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27562,17 +27628,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27580,7 +27646,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27590,7 +27656,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27600,26 +27666,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27725,7 +27791,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -27739,12 +27805,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1099",
    "self_type" : "type-1099",
@@ -27776,16 +27842,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27803,7 +27869,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27813,16 +27879,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1072",
    "self_type" : "type-1072",
@@ -27836,16 +27902,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27855,19 +27921,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27879,19 +27945,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_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<hidl_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<hidl_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<hidl_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-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27911,7 +27977,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27925,12 +27991,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1151",
    "self_type" : "type-1151",
@@ -27944,16 +28010,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27963,19 +28029,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned 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<unsigned 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<unsigned 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-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -27997,7 +28063,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28009,8 +28075,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28023,7 +28089,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -28037,7 +28103,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28064,7 +28130,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -28073,7 +28139,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28158,33 +28224,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28194,7 +28260,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -28205,8 +28271,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28218,13 +28284,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28254,7 +28320,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28284,7 +28350,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28309,13 +28375,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28326,11 +28392,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28340,13 +28406,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28357,11 +28423,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28394,23 +28460,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "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"
@@ -28421,13 +28487,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28536,13 +28602,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "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",
@@ -28656,12 +28722,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28670,7 +28736,7 @@
    "self_type" : "type-694",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28700,17 +28766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28720,17 +28786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28740,17 +28806,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28760,17 +28826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28780,17 +28846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28800,17 +28866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28820,17 +28886,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28840,17 +28906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28860,17 +28926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28880,17 +28946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28920,17 +28986,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "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-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28940,36 +29006,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "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-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28979,8 +29045,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -28990,33 +29056,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29045,8 +29111,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29056,8 +29122,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29067,11 +29133,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29082,26 +29148,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29111,11 +29177,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29126,26 +29192,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -29155,22 +29221,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29181,15 +29247,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29199,8 +29265,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29210,11 +29276,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29225,7 +29291,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29265,8 +29331,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29276,11 +29342,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29291,18 +29357,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29320,11 +29386,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -29335,18 +29401,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29364,33 +29430,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -29408,8 +29474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29419,11 +29485,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29434,7 +29500,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29474,8 +29540,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29485,11 +29551,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29500,7 +29566,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29511,7 +29577,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29533,18 +29599,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -29555,7 +29621,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -29573,41 +29639,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29617,8 +29683,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29628,22 +29694,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29672,11 +29738,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29687,15 +29753,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29705,8 +29771,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29716,22 +29782,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29742,7 +29808,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29760,11 +29826,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29775,18 +29841,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -29804,22 +29870,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29830,15 +29896,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29859,30 +29925,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29892,8 +29958,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29907,18 +29973,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -29927,12 +29993,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29950,20 +30016,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2437"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29980,8 +30046,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -29991,13 +30057,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2383"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30008,13 +30074,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30025,16 +30091,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -30065,12 +30131,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -30097,7 +30163,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30119,7 +30185,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30129,32 +30195,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30171,33 +30237,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30208,28 +30274,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30304,43 +30370,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30351,108 +30417,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30463,63 +30529,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30530,33 +30606,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30567,13 +30643,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30584,7 +30660,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30599,38 +30675,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30696,12 +30772,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30728,22 +30804,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30775,27 +30851,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30827,27 +30903,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30879,32 +30955,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30926,28 +31002,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30957,13 +31033,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30974,8 +31050,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30988,8 +31064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31015,8 +31091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31024,8 +31100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31033,8 +31109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31051,7 +31127,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31060,7 +31136,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31069,7 +31145,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31088,7 +31164,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31096,8 +31172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31105,8 +31181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31114,8 +31190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31123,8 +31199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31141,7 +31217,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/x86_64/source-based/libui.so.lsdump b/29/64/x86_64/source-based/libui.so.lsdump
index 2c14427..e4ef990 100644
--- a/29/64/x86_64/source-based/libui.so.lsdump
+++ b/29/64/x86_64/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-510",
-   "self_type" : "type-509",
+   "referenced_type" : "type-508",
+   "self_type" : "type-507",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-218",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-203",
+   "self_type" : "type-2431",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-290",
+   "referenced_type" : "type-287",
    "self_type" : "type-1260",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-144",
+   "referenced_type" : "type-105",
+   "self_type" : "type-146",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-565",
+   "referenced_type" : "type-105",
+   "self_type" : "type-562",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-207",
+   "referenced_type" : "type-220",
    "self_type" : "type-1267",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1110",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-351",
+   "referenced_type" : "type-125",
+   "self_type" : "type-348",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [12]",
    "name" : "unsigned long [12]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-560",
+   "referenced_type" : "type-126",
+   "self_type" : "type-557",
    "size" : 96,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [25]",
    "name" : "unsigned long [25]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-559",
+   "referenced_type" : "type-126",
+   "self_type" : "type-556",
    "size" : 200,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long [3]",
    "name" : "unsigned long [3]",
-   "referenced_type" : "type-124",
-   "self_type" : "type-944",
+   "referenced_type" : "type-126",
+   "self_type" : "type-936",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 8,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-525",
+   "referenced_type" : "type-230",
+   "self_type" : "type-522",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 8,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-599",
-   "size" : 24,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 8,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-521",
+   "referenced_type" : "type-230",
+   "self_type" : "type-518",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-578",
+   "referenced_type" : "type-230",
+   "self_type" : "type-575",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -154,8 +145,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-217",
-   "self_type" : "type-526",
+   "referenced_type" : "type-230",
+   "self_type" : "type-523",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   }
@@ -177,8 +168,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-290",
-   "self_type" : "type-290",
+   "referenced_type" : "type-287",
+   "self_type" : "type-287",
    "size" : 1
   },
   {
@@ -187,16 +178,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-181",
-   "self_type" : "type-181",
+   "referenced_type" : "type-183",
+   "self_type" : "type-183",
    "size" : 2
   },
   {
    "alignment" : 8,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "type-44",
+   "self_type" : "type-44",
    "size" : 8
   },
   {
@@ -212,8 +203,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -221,16 +212,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-286",
-   "self_type" : "type-286",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
    "alignment" : 16,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-310",
-   "self_type" : "type-310",
+   "referenced_type" : "type-305",
+   "self_type" : "type-305",
    "size" : 16
   },
   {
@@ -238,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-732",
-   "self_type" : "type-732",
+   "referenced_type" : "type-730",
+   "self_type" : "type-730",
    "size" : 8
   },
   {
@@ -266,8 +257,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -276,8 +267,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -286,8 +277,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long",
    "name" : "unsigned long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -296,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-222",
+   "self_type" : "type-222",
    "size" : 8
   },
   {
@@ -313,8 +304,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150"
+   "referenced_type" : "type-153",
+   "self_type" : "type-153"
   }
  ],
  "elf_functions" :
@@ -1805,7 +1796,7 @@
    "self_type" : "type-618",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1967,11 +1958,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1989,11 +1980,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2019,7 +2010,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2041,11 +2032,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2068,11 +2059,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2098,11 +2089,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-630",
-   "self_type" : "type-630",
+   "referenced_type" : "type-631",
+   "self_type" : "type-631",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-207",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2120,11 +2111,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-531",
-   "self_type" : "type-531",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2138,11 +2129,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2156,11 +2147,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-865",
-   "self_type" : "type-865",
+   "referenced_type" : "type-863",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2178,7 +2169,7 @@
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2192,11 +2183,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2430",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2432",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2210,11 +2201,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-398",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2228,11 +2219,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-430",
-   "self_type" : "type-430",
+   "referenced_type" : "type-427",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2250,7 +2241,7 @@
    "self_type" : "type-1264",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2268,7 +2259,7 @@
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2286,7 +2277,7 @@
    "self_type" : "type-1142",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2304,7 +2295,7 @@
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2318,11 +2309,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1418",
-   "self_type" : "type-1418",
+   "referenced_type" : "type-1419",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2336,11 +2327,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-155",
-   "self_type" : "type-155",
+   "referenced_type" : "type-150",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2354,11 +2345,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-317",
-   "self_type" : "type-317",
+   "referenced_type" : "type-312",
+   "self_type" : "type-312",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2373,11 +2364,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-404",
-   "self_type" : "type-404",
+   "referenced_type" : "type-400",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2403,7 +2394,7 @@
    "self_type" : "type-1320",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2425,7 +2416,7 @@
    "self_type" : "type-1130",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2447,11 +2438,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-278",
-   "self_type" : "type-278",
+   "referenced_type" : "type-274",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2505,7 +2496,7 @@
    "self_type" : "type-1306",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2559,7 +2550,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2661,11 +2652,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2719,7 +2710,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2761,7 +2752,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3003,7 +2994,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3029,7 +3020,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3123,7 +3114,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3157,7 +3148,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3267,11 +3258,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3337,7 +3328,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3595,7 +3586,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3717,7 +3708,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3747,7 +3738,7 @@
    "self_type" : "type-1172",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3861,11 +3852,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-422",
-   "self_type" : "type-422",
+   "referenced_type" : "type-419",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3935,7 +3926,7 @@
    "self_type" : "type-1193",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4209,7 +4200,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4239,7 +4230,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4365,7 +4356,7 @@
    "self_type" : "type-1195",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4387,11 +4378,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "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-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4429,11 +4420,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4463,11 +4454,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2441",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2443",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4517,7 +4508,7 @@
    "self_type" : "type-1256",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4571,7 +4562,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4597,7 +4588,7 @@
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4639,7 +4630,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4881,7 +4872,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4911,7 +4902,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4941,7 +4932,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4983,7 +4974,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5021,7 +5012,7 @@
    "self_type" : "type-1228",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5047,7 +5038,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5065,7 +5056,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5095,7 +5086,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5189,7 +5180,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5231,7 +5222,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5249,7 +5240,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5279,7 +5270,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5313,7 +5304,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5367,7 +5358,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5380,18 +5371,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-186"
+     "referenced_type" : "type-188"
     },
     {
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-273",
+   "referenced_type" : "type-269",
    "return_type" : "type-6",
-   "self_type" : "type-273",
+   "self_type" : "type-269",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5404,11 +5395,11 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
    "referenced_type" : "type-609",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-609",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5422,26 +5413,26 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5452,15 +5443,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "referenced_type" : "type-583",
-   "return_type" : "type-103",
-   "self_type" : "type-583",
+   "referenced_type" : "type-580",
+   "return_type" : "type-105",
+   "self_type" : "type-580",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5470,18 +5461,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-592",
+   "return_type" : "type-105",
+   "self_type" : "type-592",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5491,33 +5482,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "referenced_type" : "type-591",
-   "return_type" : "type-103",
-   "self_type" : "type-591",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5527,36 +5518,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-598",
-   "return_type" : "type-103",
-   "self_type" : "type-598",
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5566,33 +5557,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     }
    ],
-   "referenced_type" : "type-587",
-   "return_type" : "type-103",
-   "self_type" : "type-587",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5602,36 +5593,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-593",
-   "return_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-581"
+    },
+    {
+     "referenced_type" : "type-143"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-581"
+    },
+    {
+     "referenced_type" : "type-143"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-599",
+   "return_type" : "type-105",
+   "self_type" : "type-599",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5641,15 +5689,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-584"
+     "referenced_type" : "type-581"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-589",
-   "return_type" : "type-103",
-   "self_type" : "type-589",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5659,18 +5707,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-555"
+     "referenced_type" : "type-552"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-554",
-   "return_type" : "type-103",
-   "self_type" : "type-554",
+   "referenced_type" : "type-551",
+   "return_type" : "type-105",
+   "self_type" : "type-551",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5680,12 +5728,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     }
    ],
-   "referenced_type" : "type-574",
-   "return_type" : "type-103",
-   "self_type" : "type-574",
+   "referenced_type" : "type-571",
+   "return_type" : "type-105",
+   "self_type" : "type-571",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5695,15 +5743,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "referenced_type" : "type-572",
-   "return_type" : "type-103",
-   "self_type" : "type-572",
+   "referenced_type" : "type-569",
+   "return_type" : "type-105",
+   "self_type" : "type-569",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5713,15 +5761,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-567",
-   "return_type" : "type-103",
-   "self_type" : "type-567",
+   "referenced_type" : "type-564",
+   "return_type" : "type-105",
+   "self_type" : "type-564",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5731,24 +5779,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-570",
-   "return_type" : "type-103",
-   "self_type" : "type-570",
+   "referenced_type" : "type-567",
+   "return_type" : "type-105",
+   "self_type" : "type-567",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5758,12 +5806,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
-   "referenced_type" : "type-562",
-   "return_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-559",
+   "return_type" : "type-105",
+   "self_type" : "type-559",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5773,12 +5821,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-251",
-   "return_type" : "type-103",
-   "self_type" : "type-251",
+   "referenced_type" : "type-253",
+   "return_type" : "type-105",
+   "self_type" : "type-253",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5791,14 +5839,14 @@
      "referenced_type" : "type-607"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-574"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-611",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "self_type" : "type-611",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5809,27 +5857,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-212"
+     "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-213"
+     "referenced_type" : "type-226"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-228"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "referenced_type" : "type-211",
-   "return_type" : "type-150",
-   "self_type" : "type-211",
+   "referenced_type" : "type-224",
+   "return_type" : "type-153",
+   "self_type" : "type-224",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5839,12 +5887,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-521"
     }
    ],
-   "referenced_type" : "type-523",
-   "return_type" : "type-150",
-   "self_type" : "type-523",
+   "referenced_type" : "type-520",
+   "return_type" : "type-153",
+   "self_type" : "type-520",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5854,18 +5902,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
-     "referenced_type" : "type-577"
+     "referenced_type" : "type-574"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-576",
-   "return_type" : "type-150",
-   "self_type" : "type-576",
+   "referenced_type" : "type-573",
+   "return_type" : "type-153",
+   "self_type" : "type-573",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5880,7 +5928,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5892,7 +5940,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5904,7 +5952,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5916,7 +5964,7 @@
      "referenced_type" : "type-1193"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5928,7 +5976,7 @@
      "referenced_type" : "type-1212"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5937,10 +5985,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5952,7 +6000,7 @@
      "referenced_type" : "type-1172"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5964,7 +6012,7 @@
      "referenced_type" : "type-1214"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5976,7 +6024,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6063,7 +6111,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1043"
@@ -6072,7 +6120,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-1443",
+   "return_type" : "type-1446",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6082,10 +6130,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6094,14 +6142,14 @@
      "referenced_type" : "type-1051"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6111,10 +6159,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6124,18 +6172,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6145,10 +6193,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6161,10 +6209,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6174,23 +6222,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6200,28 +6248,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6231,23 +6279,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6257,10 +6305,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6269,14 +6317,14 @@
      "referenced_type" : "type-1051"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6286,10 +6334,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6299,18 +6347,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6320,10 +6368,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
      "referenced_type" : "type-1037"
@@ -6336,10 +6384,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6349,23 +6397,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
-     "referenced_type" : "type-1034"
+     "referenced_type" : "type-1031"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6375,28 +6423,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6406,23 +6454,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1007"
+     "referenced_type" : "type-1003"
     },
     {
-     "referenced_type" : "type-1030"
+     "referenced_type" : "type-1026"
     },
     {
-     "referenced_type" : "type-935"
+     "referenced_type" : "type-929"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6432,16 +6480,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1428"
+     "referenced_type" : "type-1432"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6450,10 +6498,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6463,10 +6511,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6476,13 +6524,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     },
     {
-     "referenced_type" : "type-1402"
+     "referenced_type" : "type-1406"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6492,25 +6540,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6521,10 +6569,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6534,13 +6582,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6551,28 +6599,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6583,34 +6631,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6620,19 +6668,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6642,22 +6690,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6667,16 +6715,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6686,22 +6734,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6714,10 +6762,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-622",
+   "return_type" : "type-623",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6726,10 +6774,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-622"
+     "referenced_type" : "type-623"
     }
    ],
-   "return_type" : "type-681",
+   "return_type" : "type-680",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6738,16 +6786,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     }
    ],
-   "return_type" : "type-624",
+   "return_type" : "type-625",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6759,7 +6807,7 @@
      "referenced_type" : "type-637"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6769,24 +6817,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6796,27 +6844,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6826,10 +6874,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6839,27 +6887,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6869,30 +6917,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6902,33 +6950,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6938,16 +6986,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6957,19 +7005,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6979,7 +7027,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
      "referenced_type" : "type-1250"
@@ -6994,7 +7042,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7004,34 +7052,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7041,26 +7089,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7070,25 +7118,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1133"
@@ -7097,7 +7145,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7107,29 +7155,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7139,10 +7187,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7152,34 +7200,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-630"
+     "referenced_type" : "type-631"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7189,26 +7237,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7218,25 +7266,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1133"
@@ -7245,7 +7293,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7255,29 +7303,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1469"
+     "referenced_type" : "type-1472"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7287,10 +7335,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7301,10 +7349,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7315,10 +7363,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7329,10 +7377,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7341,16 +7389,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7360,10 +7408,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-342"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7373,10 +7421,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-342"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7392,10 +7440,10 @@
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7411,7 +7459,7 @@
      "referenced_type" : "type-971"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7427,7 +7475,7 @@
      "referenced_type" : "type-971"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7440,7 +7488,7 @@
      "referenced_type" : "type-967"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7453,7 +7501,7 @@
      "referenced_type" : "type-967"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7479,13 +7527,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7495,13 +7543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7520,7 +7568,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7539,7 +7587,7 @@
      "referenced_type" : "type-1043"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7549,16 +7597,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     },
     {
      "referenced_type" : "type-1362"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7569,10 +7617,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7582,13 +7630,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1406"
+     "referenced_type" : "type-1410"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-1470",
+   "return_type" : "type-1473",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7598,19 +7646,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7620,28 +7668,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7651,16 +7699,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7670,34 +7718,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7707,25 +7755,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7735,19 +7783,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7757,30 +7805,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7790,13 +7838,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7806,33 +7854,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7842,36 +7890,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7881,22 +7929,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7907,10 +7955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7921,10 +7969,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7933,16 +7981,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2449"
+     "referenced_type" : "type-2451"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7952,13 +8000,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7968,93 +8016,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-345"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1471"
+     "referenced_type" : "type-1474"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-546"
+     "referenced_type" : "type-543"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8067,7 +8115,7 @@
      "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8080,7 +8128,7 @@
      "referenced_type" : "type-1360"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8090,7 +8138,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
      "referenced_type" : "type-10"
@@ -8099,7 +8147,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8109,7 +8157,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
      "referenced_type" : "type-10"
@@ -8124,7 +8172,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8134,10 +8182,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8146,7 +8194,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8156,10 +8204,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8195,13 +8243,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8211,13 +8259,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8227,10 +8275,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8240,13 +8288,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8256,13 +8304,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8272,10 +8320,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8285,10 +8333,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8298,10 +8346,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8311,13 +8359,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2437"
+     "referenced_type" : "type-2439"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2443",
+   "return_type" : "type-2445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8330,7 +8378,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8343,16 +8391,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8368,10 +8416,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8387,10 +8435,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1299",
@@ -8406,10 +8454,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8422,10 +8470,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8434,7 +8482,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "referenced_type" : "type-1362"
@@ -8452,7 +8500,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-890"
+     "referenced_type" : "type-882"
     },
     {
      "referenced_type" : "type-1362"
@@ -8486,7 +8534,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8502,7 +8550,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8515,10 +8563,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8534,7 +8582,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8547,10 +8595,10 @@
      "referenced_type" : "type-1359"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8560,13 +8608,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8576,13 +8624,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8592,19 +8640,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8615,16 +8663,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8635,22 +8683,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8661,16 +8709,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8680,16 +8728,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8699,10 +8747,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8712,22 +8760,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8737,19 +8785,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8759,25 +8807,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8787,19 +8835,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8809,25 +8857,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8836,10 +8884,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2390",
+   "return_type" : "type-2392",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8849,13 +8897,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8865,16 +8913,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8884,16 +8932,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8903,10 +8951,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8916,13 +8964,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8932,13 +8980,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8948,19 +8996,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8970,13 +9018,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8986,13 +9034,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9002,19 +9050,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9024,13 +9072,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9040,13 +9088,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9056,19 +9104,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9078,10 +9126,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
@@ -9098,7 +9146,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-10"
@@ -9107,7 +9155,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9117,19 +9165,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9139,16 +9187,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9158,16 +9206,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9177,13 +9225,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9193,13 +9241,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9209,10 +9257,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9222,13 +9270,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9238,13 +9286,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9254,10 +9302,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9267,10 +9315,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9280,10 +9328,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9293,13 +9341,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2394",
+   "return_type" : "type-2396",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9309,10 +9357,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9322,13 +9370,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9338,13 +9386,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1399"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9354,7 +9402,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1250"
@@ -9369,7 +9417,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9379,13 +9427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9395,13 +9443,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9411,13 +9459,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9427,13 +9475,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9443,13 +9491,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1411"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9459,13 +9507,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9476,7 +9524,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
@@ -9485,7 +9533,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9495,13 +9543,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9511,13 +9559,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-1411"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9527,13 +9575,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9544,7 +9592,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
      "referenced_type" : "type-1362"
@@ -9553,7 +9601,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9563,25 +9611,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1398"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-528",
+   "return_type" : "type-525",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-545",
+   "return_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9591,7 +9639,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     }
    ],
    "return_type" : "type-6",
@@ -9604,10 +9652,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9617,16 +9665,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1430"
+     "referenced_type" : "type-1434"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9646,7 +9694,7 @@
      "referenced_type" : "type-1120"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9660,13 +9708,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9680,13 +9728,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9700,16 +9748,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9723,16 +9771,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9746,16 +9794,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9769,16 +9817,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9788,10 +9836,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9801,28 +9849,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9832,7 +9880,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
    "return_type" : "type-637",
@@ -9845,10 +9893,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9858,10 +9906,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-629",
+   "return_type" : "type-630",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9871,7 +9919,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     },
     {
      "referenced_type" : "type-1249"
@@ -9886,7 +9934,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9896,10 +9944,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-624"
+     "referenced_type" : "type-625"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9909,13 +9957,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9925,28 +9973,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-352"
+     "referenced_type" : "type-349"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9956,16 +10004,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
      "referenced_type" : "type-1123"
     },
     {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9975,16 +10023,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9994,19 +10042,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10016,31 +10064,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10051,13 +10099,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-353"
+     "referenced_type" : "type-350"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10067,25 +10115,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10095,31 +10143,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-255"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     },
     {
-     "referenced_type" : "type-596"
+     "referenced_type" : "type-593"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10129,13 +10177,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10145,7 +10193,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
    "return_type" : "type-6",
@@ -10161,7 +10209,7 @@
      "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10174,13 +10222,13 @@
      "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10190,10 +10238,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10203,34 +10251,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-348"
+     "referenced_type" : "type-345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10240,7 +10288,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "return_type" : "type-6",
@@ -10253,10 +10301,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10266,13 +10314,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
-     "referenced_type" : "type-722"
+     "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10282,13 +10330,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10301,7 +10349,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-6",
@@ -10314,10 +10362,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10327,7 +10375,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10340,7 +10388,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10353,7 +10401,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10366,7 +10414,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
    "return_type" : "type-10",
@@ -10379,13 +10427,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10395,16 +10443,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
-    },
-    {
      "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-2446"
+    },
+    {
+     "referenced_type" : "type-285"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10415,10 +10463,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10428,10 +10476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10441,10 +10489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-2435",
+   "return_type" : "type-2437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10454,10 +10502,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     }
    ],
-   "return_type" : "type-2428",
+   "return_type" : "type-2430",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10467,7 +10515,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1246"
@@ -10487,13 +10535,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2390",
+   "return_type" : "type-2392",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10503,7 +10551,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1051"
@@ -10519,7 +10567,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1055"
@@ -10535,7 +10583,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
      "referenced_type" : "type-1279"
@@ -10551,13 +10599,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-25",
@@ -10570,10 +10618,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-1055",
@@ -10586,13 +10634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2442"
+     "referenced_type" : "type-2444"
     },
     {
-     "referenced_type" : "type-2439"
+     "referenced_type" : "type-2441"
     }
    ],
-   "return_type" : "type-2435",
+   "return_type" : "type-2437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10640,13 +10688,13 @@
      "referenced_type" : "type-1297"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10710,7 +10758,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10723,7 +10771,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10736,7 +10784,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10749,7 +10797,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10774,7 +10822,7 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10784,13 +10832,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10800,13 +10848,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10816,19 +10864,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10838,10 +10886,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10851,10 +10899,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
    "return_type" : "type-6",
@@ -10867,7 +10915,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
    "return_type" : "type-1297",
@@ -10880,17 +10928,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10900,20 +10948,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
-    },
-    {
      "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-2399"
+    },
+    {
+     "referenced_type" : "type-285"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10923,7 +10971,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     }
    ],
    "return_type" : "type-1297",
@@ -10936,13 +10984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10952,13 +11000,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10968,19 +11016,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10990,16 +11038,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11009,7 +11057,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1283"
@@ -11025,13 +11073,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11044,10 +11092,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2396"
+     "referenced_type" : "type-2398"
     }
    ],
    "return_type" : "type-1297",
@@ -11060,13 +11108,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11076,13 +11124,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11092,19 +11140,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11114,13 +11162,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11130,13 +11178,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11146,19 +11194,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11169,16 +11217,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11189,22 +11237,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11215,16 +11263,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2397"
+    },
+    {
      "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2393"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11234,16 +11282,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11254,16 +11302,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11274,16 +11322,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11294,19 +11342,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11317,19 +11365,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11340,19 +11388,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11363,19 +11411,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2388"
+     "referenced_type" : "type-2390"
     },
     {
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "referenced_type" : "type-1120"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-150",
+   "return_type" : "type-153",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11385,10 +11433,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11398,10 +11446,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
-   "return_type" : "type-286",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11411,7 +11459,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1401"
     }
    ],
    "return_type" : "type-6",
@@ -11424,10 +11472,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11437,10 +11485,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-124",
+   "return_type" : "type-126",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11450,7 +11498,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11465,24 +11513,24 @@
      "referenced_type" : "type-1146"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11518,41 +11566,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2389",
+   "referenced_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-541",
+   "referenced_type" : "type-538",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-254",
+   "referenced_type" : "type-282",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-546",
+   "referenced_type" : "type-543",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11562,8 +11610,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11571,8 +11619,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1413",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11580,8 +11628,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-543",
-   "self_type" : "type-545",
+   "referenced_type" : "type-540",
+   "self_type" : "type-542",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11589,8 +11637,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-529",
-   "self_type" : "type-528",
+   "referenced_type" : "type-526",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11598,7 +11646,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities &",
    "name" : "android::HdrCapabilities &",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-972",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -11607,8 +11655,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-254",
-   "self_type" : "type-258",
+   "referenced_type" : "type-282",
+   "self_type" : "type-1378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11625,8 +11673,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-264",
-   "self_type" : "type-268",
+   "referenced_type" : "type-260",
+   "self_type" : "type-264",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11643,8 +11691,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2396",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11652,8 +11700,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-178",
-   "self_type" : "type-187",
+   "referenced_type" : "type-180",
+   "self_type" : "type-189",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11661,8 +11709,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-287",
-   "self_type" : "type-893",
+   "referenced_type" : "type-284",
+   "self_type" : "type-891",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11670,8 +11718,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2389",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11688,8 +11736,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2436",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11697,8 +11745,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-340",
-   "self_type" : "type-411",
+   "referenced_type" : "type-336",
+   "self_type" : "type-408",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11706,8 +11754,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-415",
-   "self_type" : "type-446",
+   "referenced_type" : "type-411",
+   "self_type" : "type-439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11724,7 +11772,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1092",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11742,8 +11790,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-73",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-68",
+   "self_type" : "type-1397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -11760,8 +11808,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-57",
-   "self_type" : "type-199",
+   "referenced_type" : "type-52",
+   "self_type" : "type-192",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11769,8 +11817,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-218",
-   "self_type" : "type-332",
+   "referenced_type" : "type-203",
+   "self_type" : "type-329",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11778,8 +11826,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11787,8 +11835,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-394",
-   "self_type" : "type-401",
+   "referenced_type" : "type-393",
+   "self_type" : "type-398",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11796,8 +11844,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11814,7 +11862,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11823,8 +11871,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11832,8 +11880,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11841,8 +11889,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1949",
-   "self_type" : "type-1948",
+   "referenced_type" : "type-1951",
+   "self_type" : "type-1950",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11850,8 +11898,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-230",
+   "referenced_type" : "type-233",
+   "self_type" : "type-232",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11859,8 +11907,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-431",
+   "referenced_type" : "type-429",
+   "self_type" : "type-428",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11868,8 +11916,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-177",
+   "referenced_type" : "type-122",
+   "self_type" : "type-179",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11886,8 +11934,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-130",
+   "referenced_type" : "type-130",
+   "self_type" : "type-132",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11905,7 +11953,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1358",
-   "self_type" : "type-1412",
+   "self_type" : "type-1416",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11913,8 +11961,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-357",
-   "self_type" : "type-379",
+   "referenced_type" : "type-354",
+   "self_type" : "type-376",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11922,8 +11970,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-485",
-   "self_type" : "type-491",
+   "referenced_type" : "type-482",
+   "self_type" : "type-488",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11931,8 +11979,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-334",
-   "self_type" : "type-387",
+   "referenced_type" : "type-331",
+   "self_type" : "type-384",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11940,8 +11988,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-53",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11949,8 +11997,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-498",
-   "self_type" : "type-504",
+   "referenced_type" : "type-496",
+   "self_type" : "type-501",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11958,8 +12006,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2445",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11982,49 +12030,49 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2168",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2408",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2410",
+   "self_type" : "type-2412",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2057",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2055",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-965",
+   "referenced_type" : "type-959",
    "self_type" : "type-975",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
@@ -12041,7 +12089,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1034",
+   "referenced_type" : "type-1031",
    "self_type" : "type-1042",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12050,8 +12098,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1399",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12059,8 +12107,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1407",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1411",
+   "self_type" : "type-1412",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12077,8 +12125,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-346",
-   "self_type" : "type-356",
+   "referenced_type" : "type-343",
+   "self_type" : "type-353",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12086,8 +12134,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12095,8 +12143,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12104,8 +12152,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12131,8 +12179,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12141,7 +12189,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12149,7 +12197,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-615",
+   "referenced_type" : "type-616",
    "self_type" : "type-632",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
@@ -12176,8 +12224,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12185,8 +12233,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-183",
-   "self_type" : "type-186",
+   "referenced_type" : "type-186",
+   "self_type" : "type-188",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12194,8 +12242,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-876",
-   "self_type" : "type-890",
+   "referenced_type" : "type-866",
+   "self_type" : "type-882",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12203,8 +12251,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12212,8 +12260,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-928",
-   "self_type" : "type-935",
+   "referenced_type" : "type-920",
+   "self_type" : "type-929",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12221,8 +12269,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2432",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2434",
+   "self_type" : "type-2435",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12230,8 +12278,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-406",
-   "self_type" : "type-407",
+   "referenced_type" : "type-403",
+   "self_type" : "type-404",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12239,8 +12287,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-434",
-   "self_type" : "type-439",
+   "referenced_type" : "type-431",
+   "self_type" : "type-436",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12293,8 +12341,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-176",
-   "self_type" : "type-185",
+   "referenced_type" : "type-171",
+   "self_type" : "type-184",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12302,8 +12350,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-327",
-   "self_type" : "type-331",
+   "referenced_type" : "type-324",
+   "self_type" : "type-328",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12311,8 +12359,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-232",
-   "self_type" : "type-233",
+   "referenced_type" : "type-234",
+   "self_type" : "type-235",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12374,8 +12422,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-131",
-   "self_type" : "type-132",
+   "referenced_type" : "type-133",
+   "self_type" : "type-134",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12393,7 +12441,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12410,8 +12458,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-275",
-   "self_type" : "type-274",
+   "referenced_type" : "type-271",
+   "self_type" : "type-270",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12419,8 +12467,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12446,8 +12494,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2441",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12455,7 +12503,7 @@
    "alignment" : 8,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-372",
+   "referenced_type" : "type-369",
    "self_type" : "type-1287",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12464,7 +12512,7 @@
    "alignment" : 8,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-854",
+   "referenced_type" : "type-851",
    "self_type" : "type-860",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12473,7 +12521,7 @@
    "alignment" : 8,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-564",
+   "referenced_type" : "type-561",
    "self_type" : "type-1226",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12488,8 +12536,8 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -12502,16 +12550,16 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2414",
-   "self_type" : "type-2416",
+   "referenced_type" : "type-2416",
+   "self_type" : "type-2418",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 8,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-563",
-   "self_type" : "type-838",
+   "referenced_type" : "type-560",
+   "self_type" : "type-836",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12534,127 +12582,127 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-127",
+   "self_type" : "type-129",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1575",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1615",
+   "self_type" : "type-1617",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-17",
-   "self_type" : "type-38",
+   "referenced_type" : "type-1786",
+   "self_type" : "type-1788",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1785",
-   "self_type" : "type-1787",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2084",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2177",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2174",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2252",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2294",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2345",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2475",
+   "self_type" : "type-2477",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2473",
-   "self_type" : "type-2475",
+   "referenced_type" : "type-38",
+   "self_type" : "type-40",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-412",
-   "self_type" : "type-414",
+   "referenced_type" : "type-409",
+   "self_type" : "type-417",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
    "referenced_type" : "type-642",
-   "self_type" : "type-644",
+   "self_type" : "type-645",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-748",
+   "referenced_type" : "type-749",
    "self_type" : "type-751",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-855",
-   "self_type" : "type-857",
+   "referenced_type" : "type-857",
+   "self_type" : "type-859",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12693,8 +12741,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12702,8 +12750,8 @@
    "alignment" : 8,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-826",
-   "self_type" : "type-830",
+   "referenced_type" : "type-825",
+   "self_type" : "type-827",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12729,8 +12777,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12738,8 +12786,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2130",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2126",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12747,8 +12795,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-1018",
-   "self_type" : "type-1030",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1026",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12756,8 +12804,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-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12765,7 +12813,7 @@
    "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-2102",
+   "referenced_type" : "type-2100",
    "self_type" : "type-2114",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12783,8 +12831,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12792,8 +12840,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2227",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12801,8 +12849,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1406",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12810,8 +12858,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12819,8 +12867,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2671",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12828,8 +12876,8 @@
    "alignment" : 8,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2333",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2335",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12846,8 +12894,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-1032",
-   "self_type" : "type-1031",
+   "referenced_type" : "type-1033",
+   "self_type" : "type-1032",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12864,8 +12912,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-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12873,8 +12921,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-1711",
-   "self_type" : "type-1710",
+   "referenced_type" : "type-1712",
+   "self_type" : "type-1711",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12882,8 +12930,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-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12891,8 +12939,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-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12900,8 +12948,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-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12909,8 +12957,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-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12918,8 +12966,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-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12927,8 +12975,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-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12936,8 +12984,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-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12945,8 +12993,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-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12954,8 +13002,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-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12963,8 +13011,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-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12972,8 +13020,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-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12981,8 +13029,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-42",
-   "self_type" : "type-41",
+   "referenced_type" : "type-46",
+   "self_type" : "type-45",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12990,8 +13038,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-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13008,8 +13056,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-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13017,8 +13065,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-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13026,8 +13074,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-963",
-   "self_type" : "type-962",
+   "referenced_type" : "type-965",
+   "self_type" : "type-964",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13035,8 +13083,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-214",
-   "self_type" : "type-823",
+   "referenced_type" : "type-227",
+   "self_type" : "type-814",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13044,7 +13092,7 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-237",
+   "referenced_type" : "type-239",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13053,8 +13101,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long &",
    "name" : "const unsigned long &",
-   "referenced_type" : "type-238",
-   "self_type" : "type-852",
+   "referenced_type" : "type-240",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13063,7 +13111,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-831",
-   "self_type" : "type-835",
+   "self_type" : "type-832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13089,7 +13137,7 @@
    "alignment" : 8,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13098,7 +13146,7 @@
    "alignment" : 8,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-596",
+   "referenced_type" : "type-593",
    "self_type" : "type-1347",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13107,8 +13155,8 @@
    "alignment" : 8,
    "linker_set_key" : "long &",
    "name" : "long &",
-   "referenced_type" : "type-286",
-   "self_type" : "type-1410",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1414",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13116,8 +13164,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13125,8 +13173,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13134,8 +13182,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2418",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2419",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13143,8 +13191,8 @@
    "alignment" : 8,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13152,8 +13200,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-2148",
-   "self_type" : "type-2147",
+   "referenced_type" : "type-2151",
+   "self_type" : "type-2150",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13161,8 +13209,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-2398",
-   "self_type" : "type-2397",
+   "referenced_type" : "type-2400",
+   "self_type" : "type-2399",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13170,8 +13218,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-2445",
-   "self_type" : "type-2444",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2446",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13179,8 +13227,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-2450",
-   "self_type" : "type-2449",
+   "referenced_type" : "type-2452",
+   "self_type" : "type-2451",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13188,8 +13236,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-723",
-   "self_type" : "type-722",
+   "referenced_type" : "type-724",
+   "self_type" : "type-723",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13197,7 +13245,7 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13206,7 +13254,7 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long &",
    "name" : "unsigned long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13215,7 +13263,7 @@
    "alignment" : 8,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-217",
+   "referenced_type" : "type-230",
    "self_type" : "type-1249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13227,8 +13275,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2067",
-   "self_type" : "type-2066",
+   "referenced_type" : "type-2070",
+   "self_type" : "type-2069",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13236,8 +13284,8 @@
    "alignment" : 8,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-623",
-   "self_type" : "type-622",
+   "referenced_type" : "type-624",
+   "self_type" : "type-623",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13245,7 +13293,7 @@
    "alignment" : 8,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-519",
+   "referenced_type" : "type-516",
    "self_type" : "type-637",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13272,8 +13320,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13281,8 +13329,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13290,8 +13338,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13299,8 +13347,8 @@
    "alignment" : 8,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2654",
-   "self_type" : "type-2653",
+   "referenced_type" : "type-2656",
+   "self_type" : "type-2655",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13317,8 +13365,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13326,8 +13374,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13335,8 +13383,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13344,8 +13392,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2621",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2623",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13353,8 +13401,8 @@
    "alignment" : 8,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2680",
-   "self_type" : "type-2679",
+   "referenced_type" : "type-2685",
+   "self_type" : "type-2684",
    "size" : 8,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13371,8 +13419,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-539",
+   "referenced_type" : "type-515",
+   "self_type" : "type-536",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13381,7 +13429,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-980",
-   "self_type" : "type-1007",
+   "self_type" : "type-1003",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13398,8 +13446,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-260",
-   "self_type" : "type-263",
+   "referenced_type" : "type-256",
+   "self_type" : "type-259",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13416,8 +13464,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1398",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13425,8 +13473,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13434,8 +13482,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1405",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13443,8 +13491,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1410",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13461,8 +13509,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13470,8 +13518,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-362",
+   "referenced_type" : "type-352",
+   "self_type" : "type-359",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13479,8 +13527,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-333",
-   "self_type" : "type-339",
+   "referenced_type" : "type-330",
+   "self_type" : "type-342",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13488,8 +13536,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-681",
+   "referenced_type" : "type-524",
+   "self_type" : "type-680",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13497,8 +13545,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-543",
-   "self_type" : "type-546",
+   "referenced_type" : "type-540",
+   "self_type" : "type-543",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13506,8 +13554,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-529",
-   "self_type" : "type-541",
+   "referenced_type" : "type-526",
+   "self_type" : "type-538",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13515,7 +13563,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities *",
    "name" : "android::HdrCapabilities *",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-967",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -13524,8 +13572,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13533,8 +13581,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13542,8 +13590,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1953",
-   "self_type" : "type-1952",
+   "referenced_type" : "type-1954",
+   "self_type" : "type-1953",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13551,8 +13599,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-293",
+   "referenced_type" : "type-291",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13560,8 +13608,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-438",
-   "self_type" : "type-437",
+   "referenced_type" : "type-435",
+   "self_type" : "type-434",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13569,8 +13617,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13579,7 +13627,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2401",
+   "self_type" : "type-2403",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13596,8 +13644,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-254",
-   "self_type" : "type-256",
+   "referenced_type" : "type-282",
+   "self_type" : "type-1376",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13605,8 +13653,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-257",
-   "self_type" : "type-259",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1380",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13623,8 +13671,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-264",
-   "self_type" : "type-266",
+   "referenced_type" : "type-260",
+   "self_type" : "type-262",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13632,8 +13680,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-267",
-   "self_type" : "type-269",
+   "referenced_type" : "type-263",
+   "self_type" : "type-265",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13641,8 +13689,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-270",
-   "self_type" : "type-271",
+   "referenced_type" : "type-266",
+   "self_type" : "type-267",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13659,8 +13707,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-248",
+   "referenced_type" : "type-174",
+   "self_type" : "type-250",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13668,8 +13716,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13695,8 +13743,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13704,8 +13752,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13713,8 +13761,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13722,8 +13770,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13731,8 +13779,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1781",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1782",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13740,8 +13788,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13749,8 +13797,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13758,8 +13806,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13767,8 +13815,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13776,8 +13824,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13785,8 +13833,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2016",
-   "self_type" : "type-2015",
+   "referenced_type" : "type-2017",
+   "self_type" : "type-2016",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13794,8 +13842,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2168",
-   "self_type" : "type-2167",
+   "referenced_type" : "type-2171",
+   "self_type" : "type-2170",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13803,8 +13851,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2246",
-   "self_type" : "type-2245",
+   "referenced_type" : "type-2248",
+   "self_type" : "type-2247",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13812,8 +13860,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2288",
-   "self_type" : "type-2287",
+   "referenced_type" : "type-2290",
+   "self_type" : "type-2289",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13821,8 +13869,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2339",
-   "self_type" : "type-2338",
+   "referenced_type" : "type-2341",
+   "self_type" : "type-2340",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13830,8 +13878,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2458",
-   "self_type" : "type-2457",
+   "referenced_type" : "type-2460",
+   "self_type" : "type-2459",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13839,8 +13887,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2624",
-   "self_type" : "type-2623",
+   "referenced_type" : "type-2626",
+   "self_type" : "type-2625",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13848,8 +13896,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2650",
-   "self_type" : "type-2649",
+   "referenced_type" : "type-2652",
+   "self_type" : "type-2651",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13857,8 +13905,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-409",
-   "self_type" : "type-408",
+   "referenced_type" : "type-406",
+   "self_type" : "type-405",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13866,8 +13914,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-515",
-   "self_type" : "type-514",
+   "referenced_type" : "type-512",
+   "self_type" : "type-511",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13884,8 +13932,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-853",
+   "self_type" : "type-852",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13911,8 +13959,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-197",
-   "self_type" : "type-196",
+   "referenced_type" : "type-200",
+   "self_type" : "type-199",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13929,8 +13977,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13947,7 +13995,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> > *",
-   "referenced_type" : "type-710",
+   "referenced_type" : "type-711",
    "self_type" : "type-712",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
@@ -13956,8 +14004,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-178",
-   "self_type" : "type-188",
+   "referenced_type" : "type-180",
+   "self_type" : "type-190",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13965,8 +14013,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-902",
+   "referenced_type" : "type-284",
+   "self_type" : "type-894",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13974,8 +14022,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-371",
-   "self_type" : "type-370",
+   "referenced_type" : "type-368",
+   "self_type" : "type-367",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13983,8 +14031,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13992,8 +14040,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::Vector<long> *",
    "name" : "android::Vector<long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14028,8 +14076,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2433",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14038,7 +14086,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-911",
-   "self_type" : "type-958",
+   "self_type" : "type-952",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14046,8 +14094,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2425",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14055,8 +14103,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-405",
+   "referenced_type" : "type-336",
+   "self_type" : "type-402",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14064,8 +14112,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-415",
-   "self_type" : "type-433",
+   "referenced_type" : "type-411",
+   "self_type" : "type-430",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14082,7 +14130,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14100,7 +14148,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14118,8 +14166,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-57",
-   "self_type" : "type-165",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14127,8 +14175,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-326",
+   "referenced_type" : "type-203",
+   "self_type" : "type-323",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14173,7 +14221,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1379",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14199,8 +14247,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-244",
-   "self_type" : "type-243",
+   "referenced_type" : "type-246",
+   "self_type" : "type-245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14217,8 +14265,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-198",
+   "self_type" : "type-197",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14226,8 +14274,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-204",
-   "self_type" : "type-212",
+   "referenced_type" : "type-217",
+   "self_type" : "type-225",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14235,8 +14283,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-283",
-   "self_type" : "type-282",
+   "referenced_type" : "type-279",
+   "self_type" : "type-278",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14244,8 +14292,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14253,8 +14301,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-394",
-   "self_type" : "type-399",
+   "referenced_type" : "type-393",
+   "self_type" : "type-396",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14262,8 +14310,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14280,7 +14328,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1308",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14307,8 +14355,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-168",
+   "referenced_type" : "type-122",
+   "self_type" : "type-170",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14316,7 +14364,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1314",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14325,8 +14373,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14334,8 +14382,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14343,8 +14391,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2117",
-   "self_type" : "type-2116",
+   "referenced_type" : "type-2121",
+   "self_type" : "type-2120",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14352,8 +14400,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2154",
-   "self_type" : "type-2153",
+   "referenced_type" : "type-2157",
+   "self_type" : "type-2156",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14361,8 +14409,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2236",
-   "self_type" : "type-2235",
+   "referenced_type" : "type-2238",
+   "self_type" : "type-2237",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14370,8 +14418,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-359",
-   "self_type" : "type-358",
+   "referenced_type" : "type-356",
+   "self_type" : "type-355",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14379,8 +14427,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-686",
-   "self_type" : "type-685",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14388,8 +14436,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-730",
-   "self_type" : "type-729",
+   "referenced_type" : "type-732",
+   "self_type" : "type-731",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14397,8 +14445,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-837",
-   "self_type" : "type-836",
+   "referenced_type" : "type-838",
+   "self_type" : "type-837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14406,8 +14454,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1998",
-   "self_type" : "type-1997",
+   "referenced_type" : "type-1999",
+   "self_type" : "type-1998",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14415,8 +14463,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2161",
-   "self_type" : "type-2160",
+   "referenced_type" : "type-2164",
+   "self_type" : "type-2163",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14424,8 +14472,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2242",
-   "self_type" : "type-2241",
+   "referenced_type" : "type-2244",
+   "self_type" : "type-2243",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14433,8 +14481,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-487",
-   "self_type" : "type-486",
+   "referenced_type" : "type-484",
+   "self_type" : "type-483",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14442,8 +14490,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-738",
-   "self_type" : "type-737",
+   "referenced_type" : "type-739",
+   "self_type" : "type-738",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14460,8 +14508,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14469,8 +14517,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14478,8 +14526,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2119",
-   "self_type" : "type-2118",
+   "referenced_type" : "type-2123",
+   "self_type" : "type-2122",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14487,8 +14535,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2156",
-   "self_type" : "type-2155",
+   "referenced_type" : "type-2159",
+   "self_type" : "type-2158",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14496,8 +14544,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2238",
-   "self_type" : "type-2237",
+   "referenced_type" : "type-2240",
+   "self_type" : "type-2239",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14505,8 +14553,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-336",
-   "self_type" : "type-335",
+   "referenced_type" : "type-333",
+   "self_type" : "type-332",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14514,8 +14562,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-689",
-   "self_type" : "type-688",
+   "referenced_type" : "type-690",
+   "self_type" : "type-689",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14541,8 +14589,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14550,8 +14598,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14559,8 +14607,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2123",
-   "self_type" : "type-2122",
+   "referenced_type" : "type-2125",
+   "self_type" : "type-2124",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14568,8 +14616,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2159",
-   "self_type" : "type-2158",
+   "referenced_type" : "type-2162",
+   "self_type" : "type-2161",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14577,8 +14625,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2240",
-   "self_type" : "type-2239",
+   "referenced_type" : "type-2242",
+   "self_type" : "type-2241",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14586,17 +14634,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-55",
-   "self_type" : "type-54",
-   "size" : 8,
-   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-691",
-   "self_type" : "type-690",
+   "referenced_type" : "type-692",
+   "self_type" : "type-691",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14620,10 +14659,19 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
+   "size" : 8,
+   "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14631,8 +14679,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14640,8 +14688,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-354",
-   "self_type" : "type-353",
+   "referenced_type" : "type-351",
+   "self_type" : "type-350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14649,8 +14697,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2008",
-   "self_type" : "type-2007",
+   "referenced_type" : "type-2009",
+   "self_type" : "type-2008",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14658,8 +14706,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2164",
-   "self_type" : "type-2163",
+   "referenced_type" : "type-2167",
+   "self_type" : "type-2166",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14667,8 +14715,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2243",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2245",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14676,8 +14724,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-500",
-   "self_type" : "type-499",
+   "referenced_type" : "type-498",
+   "self_type" : "type-497",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14721,8 +14769,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-138",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14739,8 +14787,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-130",
+   "self_type" : "type-131",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14757,8 +14805,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-366",
+   "referenced_type" : "type-173",
+   "self_type" : "type-363",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14766,8 +14814,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-297",
-   "self_type" : "type-374",
+   "referenced_type" : "type-294",
+   "self_type" : "type-371",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14776,7 +14824,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14793,8 +14841,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-680",
-   "self_type" : "type-682",
+   "referenced_type" : "type-679",
+   "self_type" : "type-683",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14802,8 +14850,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-378",
+   "referenced_type" : "type-354",
+   "self_type" : "type-375",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14811,8 +14859,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-485",
-   "self_type" : "type-489",
+   "referenced_type" : "type-482",
+   "self_type" : "type-487",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14820,8 +14868,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-334",
-   "self_type" : "type-386",
+   "referenced_type" : "type-331",
+   "self_type" : "type-383",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14829,8 +14877,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-53",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14838,8 +14886,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-498",
-   "self_type" : "type-503",
+   "referenced_type" : "type-496",
+   "self_type" : "type-500",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14847,8 +14895,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-373",
-   "self_type" : "type-375",
+   "referenced_type" : "type-370",
+   "self_type" : "type-372",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14865,8 +14913,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2439",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14874,8 +14922,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2450",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14892,8 +14940,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-520",
-   "self_type" : "type-524",
+   "referenced_type" : "type-517",
+   "self_type" : "type-521",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14901,8 +14949,8 @@
    "alignment" : 8,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-350",
-   "self_type" : "type-349",
+   "referenced_type" : "type-347",
+   "self_type" : "type-346",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14910,8 +14958,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-273",
-   "self_type" : "type-276",
+   "referenced_type" : "type-269",
+   "self_type" : "type-272",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14920,7 +14968,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-352",
+   "self_type" : "type-349",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14928,8 +14976,8 @@
    "alignment" : 8,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-290",
-   "self_type" : "type-577",
+   "referenced_type" : "type-287",
+   "self_type" : "type-574",
    "size" : 8,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14937,8 +14985,8 @@
    "alignment" : 8,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2072",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2074",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14947,7 +14995,7 @@
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
    "referenced_type" : "type-627",
-   "self_type" : "type-629",
+   "self_type" : "type-630",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14956,7 +15004,7 @@
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
    "referenced_type" : "type-639",
-   "self_type" : "type-640",
+   "self_type" : "type-641",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14964,8 +15012,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-536",
-   "self_type" : "type-537",
+   "referenced_type" : "type-534",
+   "self_type" : "type-535",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15000,8 +15048,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1400",
+   "self_type" : "type-1401",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15009,8 +15057,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15027,8 +15075,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1429",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1433",
+   "self_type" : "type-1434",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15036,8 +15084,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-363",
-   "self_type" : "type-364",
+   "referenced_type" : "type-360",
+   "self_type" : "type-361",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15045,8 +15093,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-346",
-   "self_type" : "type-347",
+   "referenced_type" : "type-343",
+   "self_type" : "type-344",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15054,8 +15102,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-625",
-   "self_type" : "type-624",
+   "referenced_type" : "type-626",
+   "self_type" : "type-625",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15063,8 +15111,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15072,8 +15120,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-615",
-   "self_type" : "type-616",
+   "referenced_type" : "type-616",
+   "self_type" : "type-617",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15090,8 +15138,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15099,8 +15147,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2399",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2401",
+   "self_type" : "type-2402",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15153,8 +15201,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2397",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15171,8 +15219,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-183",
-   "self_type" : "type-184",
+   "referenced_type" : "type-186",
+   "self_type" : "type-187",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15180,8 +15228,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-876",
-   "self_type" : "type-881",
+   "referenced_type" : "type-866",
+   "self_type" : "type-877",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15189,8 +15237,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2385",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2387",
+   "self_type" : "type-2390",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15198,8 +15246,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::Vector<long> *",
    "name" : "const android::Vector<long> *",
-   "referenced_type" : "type-1426",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1430",
+   "self_type" : "type-1431",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15207,8 +15255,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1423",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1427",
+   "self_type" : "type-1428",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15225,7 +15273,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-928",
+   "referenced_type" : "type-920",
    "self_type" : "type-977",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15253,7 +15301,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1056",
-   "self_type" : "type-1422",
+   "self_type" : "type-1426",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15261,7 +15309,7 @@
    "alignment" : 8,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-40",
+   "referenced_type" : "type-42",
    "self_type" : "type-147",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
@@ -15288,8 +15336,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-201",
+   "referenced_type" : "type-202",
+   "self_type" : "type-214",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15297,8 +15345,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15306,8 +15354,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-402",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-401",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15315,8 +15363,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15342,8 +15390,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-299",
+   "referenced_type" : "type-292",
+   "self_type" : "type-296",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15351,8 +15399,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-189",
-   "self_type" : "type-203",
+   "referenced_type" : "type-191",
+   "self_type" : "type-216",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15369,8 +15417,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15378,8 +15426,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15387,8 +15435,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-383",
-   "self_type" : "type-385",
+   "referenced_type" : "type-380",
+   "self_type" : "type-382",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15396,8 +15444,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2007",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15405,8 +15453,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-495",
-   "self_type" : "type-497",
+   "referenced_type" : "type-492",
+   "self_type" : "type-494",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15414,8 +15462,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-152",
-   "self_type" : "type-151",
+   "referenced_type" : "type-155",
+   "self_type" : "type-154",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15423,8 +15471,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-159",
-   "self_type" : "type-158",
+   "referenced_type" : "type-161",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15432,8 +15480,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-424",
-   "self_type" : "type-423",
+   "referenced_type" : "type-421",
+   "self_type" : "type-420",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15441,8 +15489,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15450,8 +15498,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15459,8 +15507,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-51",
-   "self_type" : "type-50",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15468,8 +15516,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15477,8 +15525,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15486,8 +15534,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15495,8 +15543,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15504,8 +15552,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15522,8 +15570,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-154",
+   "referenced_type" : "type-156",
+   "self_type" : "type-157",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15531,8 +15579,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-161",
+   "referenced_type" : "type-162",
+   "self_type" : "type-163",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15540,8 +15588,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-425",
-   "self_type" : "type-426",
+   "referenced_type" : "type-422",
+   "self_type" : "type-423",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15558,8 +15606,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-145",
-   "self_type" : "type-146",
+   "referenced_type" : "type-148",
+   "self_type" : "type-149",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15567,8 +15615,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-131",
-   "self_type" : "type-133",
+   "referenced_type" : "type-133",
+   "self_type" : "type-135",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15585,8 +15633,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-169",
-   "self_type" : "type-175",
+   "referenced_type" : "type-172",
+   "self_type" : "type-178",
    "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/IBase.h"
   },
@@ -15594,8 +15642,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-296",
-   "self_type" : "type-298",
+   "referenced_type" : "type-293",
+   "self_type" : "type-295",
    "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"
   },
@@ -15604,7 +15652,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15621,8 +15669,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-382",
+   "referenced_type" : "type-378",
+   "self_type" : "type-379",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15630,8 +15678,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-493",
-   "self_type" : "type-494",
+   "referenced_type" : "type-490",
+   "self_type" : "type-491",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15639,8 +15687,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-389",
-   "self_type" : "type-390",
+   "referenced_type" : "type-386",
+   "self_type" : "type-387",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15648,8 +15696,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15657,8 +15705,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-506",
-   "self_type" : "type-507",
+   "referenced_type" : "type-503",
+   "self_type" : "type-504",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15675,8 +15723,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-367",
-   "self_type" : "type-368",
+   "referenced_type" : "type-364",
+   "self_type" : "type-365",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15684,8 +15732,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-376",
-   "self_type" : "type-377",
+   "referenced_type" : "type-373",
+   "self_type" : "type-374",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15702,8 +15750,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2438",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2440",
+   "self_type" : "type-2444",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15711,8 +15759,8 @@
    "alignment" : 8,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2446",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2448",
+   "self_type" : "type-2449",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15720,8 +15768,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-289",
-   "self_type" : "type-288",
+   "referenced_type" : "type-286",
+   "self_type" : "type-285",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15729,8 +15777,8 @@
    "alignment" : 8,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-180",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-181",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15738,8 +15786,8 @@
    "alignment" : 8,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-585",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15747,8 +15795,8 @@
    "alignment" : 8,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-556",
-   "self_type" : "type-555",
+   "referenced_type" : "type-553",
+   "self_type" : "type-552",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15756,7 +15804,7 @@
    "alignment" : 8,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1350",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15775,7 +15823,7 @@
    "linker_set_key" : "const long *",
    "name" : "const long *",
    "referenced_type" : "type-848",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15783,8 +15831,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-142",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15792,8 +15840,8 @@
    "alignment" : 8,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-141",
-   "self_type" : "type-348",
+   "referenced_type" : "type-143",
+   "self_type" : "type-345",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15801,8 +15849,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-214",
-   "self_type" : "type-213",
+   "referenced_type" : "type-227",
+   "self_type" : "type-226",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15810,7 +15858,7 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-237",
+   "referenced_type" : "type-239",
    "self_type" : "type-1105",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15819,8 +15867,8 @@
    "alignment" : 8,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-216",
-   "self_type" : "type-215",
+   "referenced_type" : "type-229",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15837,8 +15885,8 @@
    "alignment" : 8,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-568",
+   "referenced_type" : "type-544",
+   "self_type" : "type-565",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15846,8 +15894,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-548",
-   "self_type" : "type-558",
+   "referenced_type" : "type-545",
+   "self_type" : "type-555",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15855,8 +15903,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-558",
-   "self_type" : "type-557",
+   "referenced_type" : "type-555",
+   "self_type" : "type-554",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15864,8 +15912,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-552",
-   "self_type" : "type-551",
+   "referenced_type" : "type-549",
+   "self_type" : "type-548",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15873,8 +15921,8 @@
    "alignment" : 8,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-550",
-   "self_type" : "type-549",
+   "referenced_type" : "type-547",
+   "self_type" : "type-546",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15900,8 +15948,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-583",
-   "self_type" : "type-582",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15909,8 +15957,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
+   "referenced_type" : "type-592",
+   "self_type" : "type-591",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15918,8 +15966,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-591",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15927,8 +15975,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-598",
-   "self_type" : "type-597",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15936,8 +15984,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-587",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15945,8 +15993,26 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "referenced_type" : "type-593",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "self_type" : "type-589",
+   "size" : 8,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 8,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 8,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-599",
+   "self_type" : "type-598",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15954,8 +16020,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
    "name" : "int (*)(const gralloc_module_t *, int, ...)",
-   "referenced_type" : "type-589",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "self_type" : "type-585",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15963,8 +16029,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-554",
-   "self_type" : "type-553",
+   "referenced_type" : "type-551",
+   "self_type" : "type-550",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15972,8 +16038,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-574",
-   "self_type" : "type-573",
+   "referenced_type" : "type-571",
+   "self_type" : "type-570",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15981,8 +16047,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-572",
-   "self_type" : "type-571",
+   "referenced_type" : "type-569",
+   "self_type" : "type-568",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15990,8 +16056,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-567",
-   "self_type" : "type-566",
+   "referenced_type" : "type-564",
+   "self_type" : "type-563",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15999,8 +16065,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-570",
-   "self_type" : "type-569",
+   "referenced_type" : "type-567",
+   "self_type" : "type-566",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16008,8 +16074,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-562",
-   "self_type" : "type-561",
+   "referenced_type" : "type-559",
+   "self_type" : "type-558",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16017,8 +16083,8 @@
    "alignment" : 8,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-251",
-   "self_type" : "type-252",
+   "referenced_type" : "type-253",
+   "self_type" : "type-254",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16026,8 +16092,8 @@
    "alignment" : 8,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-596",
+   "referenced_type" : "type-105",
+   "self_type" : "type-593",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16044,8 +16110,8 @@
    "alignment" : 8,
    "linker_set_key" : "long *",
    "name" : "long *",
-   "referenced_type" : "type-286",
-   "self_type" : "type-1433",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16053,7 +16119,7 @@
    "alignment" : 8,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-143",
+   "referenced_type" : "type-145",
    "self_type" : "type-1133",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16062,8 +16128,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-207",
-   "self_type" : "type-206",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16071,8 +16137,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16080,8 +16146,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long *",
    "name" : "unsigned long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-2396",
+   "referenced_type" : "type-126",
+   "self_type" : "type-2398",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16089,8 +16155,8 @@
    "alignment" : 8,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-209",
-   "self_type" : "type-208",
+   "referenced_type" : "type-222",
+   "self_type" : "type-221",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16107,8 +16173,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-211",
-   "self_type" : "type-210",
+   "referenced_type" : "type-224",
+   "self_type" : "type-223",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16116,8 +16182,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-523",
-   "self_type" : "type-522",
+   "referenced_type" : "type-520",
+   "self_type" : "type-519",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16125,8 +16191,8 @@
    "alignment" : 8,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-576",
-   "self_type" : "type-575",
+   "referenced_type" : "type-573",
+   "self_type" : "type-572",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16134,8 +16200,8 @@
    "alignment" : 8,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-150",
-   "self_type" : "type-217",
+   "referenced_type" : "type-153",
+   "self_type" : "type-230",
    "size" : 8,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16143,8 +16209,8 @@
    "alignment" : 8,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-217",
-   "self_type" : "type-253",
+   "referenced_type" : "type-230",
+   "self_type" : "type-255",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16156,8 +16222,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16186,8 +16252,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1578",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16196,8 +16262,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-17",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16206,8 +16272,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16216,8 +16282,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-173",
-   "self_type" : "type-172",
+   "referenced_type" : "type-176",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16226,8 +16292,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1781",
-   "self_type" : "type-1783",
+   "referenced_type" : "type-1782",
+   "self_type" : "type-1784",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16236,8 +16302,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16246,8 +16312,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16256,8 +16322,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16266,8 +16332,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16276,8 +16342,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16286,8 +16352,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2017",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2018",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16296,8 +16362,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2169",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2172",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16306,8 +16372,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2249",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16316,8 +16382,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2291",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16326,8 +16392,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2342",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16336,8 +16402,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16346,8 +16412,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2625",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2627",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16356,8 +16422,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2651",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2653",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16366,8 +16432,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-408",
-   "self_type" : "type-410",
+   "referenced_type" : "type-405",
+   "self_type" : "type-407",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16376,8 +16442,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-514",
-   "self_type" : "type-516",
+   "referenced_type" : "type-511",
+   "self_type" : "type-513",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16387,7 +16453,7 @@
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
    "referenced_type" : "type-744",
-   "self_type" : "type-746",
+   "self_type" : "type-747",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16396,8 +16462,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-853",
+   "referenced_type" : "type-852",
+   "self_type" : "type-854",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16426,8 +16492,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-194",
-   "self_type" : "type-193",
+   "referenced_type" : "type-197",
+   "self_type" : "type-196",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16443,32 +16509,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2135",
-   "self_type" : "type-2134",
+   "referenced_type" : "type-2134",
+   "self_type" : "type-2133",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2071",
-   "self_type" : "type-2070",
+   "referenced_type" : "type-2073",
+   "self_type" : "type-2072",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16484,7 +16550,7 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-519",
+   "referenced_type" : "type-516",
    "self_type" : "type-639",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -16493,32 +16559,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2046",
+   "self_type" : "type-2045",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2426",
-   "self_type" : "type-2425",
+   "referenced_type" : "type-2428",
+   "self_type" : "type-2427",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-966",
-   "self_type" : "type-965",
+   "referenced_type" : "type-960",
+   "self_type" : "type-959",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16526,8 +16592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-518",
-   "self_type" : "type-536",
+   "referenced_type" : "type-515",
+   "self_type" : "type-534",
    "size" : 184,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16547,7 +16613,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-982",
-   "self_type" : "type-1034",
+   "self_type" : "type-1031",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16576,8 +16642,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1400",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16586,8 +16652,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16596,8 +16662,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16606,8 +16672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16626,8 +16692,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1433",
    "size" : 128,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16636,8 +16702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-355",
-   "self_type" : "type-363",
+   "referenced_type" : "type-352",
+   "self_type" : "type-360",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16646,8 +16712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-333",
-   "self_type" : "type-346",
+   "referenced_type" : "type-330",
+   "self_type" : "type-343",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16656,8 +16722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2061",
-   "self_type" : "type-2060",
+   "referenced_type" : "type-2063",
+   "self_type" : "type-2062",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16666,8 +16732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2227",
-   "self_type" : "type-2226",
+   "referenced_type" : "type-2230",
+   "self_type" : "type-2229",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16676,8 +16742,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2231",
-   "self_type" : "type-2230",
+   "referenced_type" : "type-2233",
+   "self_type" : "type-2232",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16706,8 +16772,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-829",
-   "self_type" : "type-828",
+   "referenced_type" : "type-830",
+   "self_type" : "type-829",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16716,8 +16782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-527",
-   "self_type" : "type-625",
+   "referenced_type" : "type-524",
+   "self_type" : "type-626",
    "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16726,8 +16792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-543",
-   "self_type" : "type-720",
+   "referenced_type" : "type-540",
+   "self_type" : "type-721",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16736,7 +16802,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-677",
+   "referenced_type" : "type-681",
    "self_type" : "type-706",
    "size" : 64,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16746,8 +16812,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-529",
-   "self_type" : "type-615",
+   "referenced_type" : "type-526",
+   "self_type" : "type-616",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16756,7 +16822,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-973",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -16766,8 +16832,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16777,7 +16843,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16826,7 +16892,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-171",
+   "referenced_type" : "type-174",
    "self_type" : "type-1078",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16836,8 +16902,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2391",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16846,7 +16912,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "const android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-710",
+   "referenced_type" : "type-711",
    "self_type" : "type-713",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
@@ -16856,8 +16922,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-178",
-   "self_type" : "type-183",
+   "referenced_type" : "type-180",
+   "self_type" : "type-186",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16866,8 +16932,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-287",
-   "self_type" : "type-876",
+   "referenced_type" : "type-284",
+   "self_type" : "type-866",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16876,8 +16942,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2387",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16886,8 +16952,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long>",
    "name" : "const android::Vector<long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1430",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16896,8 +16962,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-236",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-238",
+   "self_type" : "type-1427",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16917,7 +16983,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-904",
-   "self_type" : "type-928",
+   "self_type" : "type-920",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16926,8 +16992,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2434",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16936,8 +17002,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-340",
-   "self_type" : "type-406",
+   "referenced_type" : "type-336",
+   "self_type" : "type-403",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16946,8 +17012,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-415",
-   "self_type" : "type-434",
+   "referenced_type" : "type-411",
+   "self_type" : "type-431",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16966,7 +17032,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-62",
+   "referenced_type" : "type-57",
    "self_type" : "type-1073",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16986,7 +17052,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-73",
+   "referenced_type" : "type-68",
    "self_type" : "type-1373",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -17006,8 +17072,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-57",
-   "self_type" : "type-176",
+   "referenced_type" : "type-52",
+   "self_type" : "type-171",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17016,8 +17082,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-218",
-   "self_type" : "type-327",
+   "referenced_type" : "type-203",
+   "self_type" : "type-324",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17027,7 +17093,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-40",
+   "self_type" : "type-42",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17056,8 +17122,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-192",
-   "self_type" : "type-200",
+   "referenced_type" : "type-195",
+   "self_type" : "type-202",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17066,8 +17132,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-204",
-   "self_type" : "type-232",
+   "referenced_type" : "type-217",
+   "self_type" : "type-234",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17076,8 +17142,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17086,8 +17152,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-394",
-   "self_type" : "type-402",
+   "referenced_type" : "type-393",
+   "self_type" : "type-399",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17096,8 +17162,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17106,7 +17172,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17126,8 +17192,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-295",
+   "referenced_type" : "type-137",
+   "self_type" : "type-292",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17136,8 +17202,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-189",
+   "referenced_type" : "type-122",
+   "self_type" : "type-191",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17146,7 +17212,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17156,8 +17222,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17166,8 +17232,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1912",
-   "self_type" : "type-1911",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17176,8 +17242,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-384",
-   "self_type" : "type-383",
+   "referenced_type" : "type-381",
+   "self_type" : "type-380",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17186,8 +17252,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2005",
-   "self_type" : "type-2004",
+   "referenced_type" : "type-2006",
+   "self_type" : "type-2005",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17196,8 +17262,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-496",
-   "self_type" : "type-495",
+   "referenced_type" : "type-493",
+   "self_type" : "type-492",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17206,8 +17272,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-149",
-   "self_type" : "type-152",
+   "referenced_type" : "type-152",
+   "self_type" : "type-155",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17276,8 +17342,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-157",
-   "self_type" : "type-159",
+   "referenced_type" : "type-159",
+   "self_type" : "type-161",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17326,8 +17392,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-422",
-   "self_type" : "type-424",
+   "referenced_type" : "type-419",
+   "self_type" : "type-421",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17376,8 +17442,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17386,8 +17452,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17396,8 +17462,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-52",
-   "self_type" : "type-51",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17406,8 +17472,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17416,8 +17482,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17426,8 +17492,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17436,8 +17502,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17446,8 +17512,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-393",
-   "self_type" : "type-392",
+   "referenced_type" : "type-390",
+   "self_type" : "type-389",
    "size" : 24,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17466,8 +17532,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-153",
+   "referenced_type" : "type-151",
+   "self_type" : "type-156",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17476,8 +17542,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-160",
+   "referenced_type" : "type-158",
+   "self_type" : "type-162",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17486,8 +17552,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-425",
+   "referenced_type" : "type-418",
+   "self_type" : "type-422",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17496,7 +17562,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-140",
    "self_type" : "type-1122",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17526,8 +17592,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-145",
+   "referenced_type" : "type-136",
+   "self_type" : "type-148",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17536,8 +17602,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-130",
+   "self_type" : "type-133",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17556,8 +17622,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-163",
-   "self_type" : "type-164",
+   "referenced_type" : "type-166",
+   "self_type" : "type-167",
    "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"
   },
@@ -17566,8 +17632,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-170",
-   "self_type" : "type-169",
+   "referenced_type" : "type-173",
+   "self_type" : "type-172",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17576,8 +17642,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-297",
-   "self_type" : "type-296",
+   "referenced_type" : "type-294",
+   "self_type" : "type-293",
    "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"
   },
@@ -17606,8 +17672,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-250",
-   "self_type" : "type-275",
+   "referenced_type" : "type-252",
+   "self_type" : "type-271",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17616,8 +17682,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17626,8 +17692,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-357",
-   "self_type" : "type-381",
+   "referenced_type" : "type-354",
+   "self_type" : "type-378",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17636,8 +17702,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-485",
-   "self_type" : "type-493",
+   "referenced_type" : "type-482",
+   "self_type" : "type-490",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17646,8 +17712,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-334",
-   "self_type" : "type-389",
+   "referenced_type" : "type-331",
+   "self_type" : "type-386",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17656,8 +17722,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-53",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17666,8 +17732,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-498",
-   "self_type" : "type-506",
+   "referenced_type" : "type-496",
+   "self_type" : "type-503",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17686,8 +17752,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-365",
-   "self_type" : "type-367",
+   "referenced_type" : "type-362",
+   "self_type" : "type-364",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17696,8 +17762,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-373",
-   "self_type" : "type-376",
+   "referenced_type" : "type-370",
+   "self_type" : "type-373",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17716,8 +17782,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2440",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17726,8 +17792,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2448",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17737,7 +17803,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-372",
+   "self_type" : "type-369",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17746,8 +17812,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-290",
-   "self_type" : "type-289",
+   "referenced_type" : "type-287",
+   "self_type" : "type-286",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17756,8 +17822,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-183",
+   "self_type" : "type-182",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17766,8 +17832,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-45",
-   "self_type" : "type-854",
+   "referenced_type" : "type-44",
+   "self_type" : "type-851",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17777,7 +17843,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-564",
+   "self_type" : "type-561",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17793,8 +17859,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17809,8 +17875,8 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2415",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2417",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17818,8 +17884,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-581",
-   "self_type" : "type-585",
+   "referenced_type" : "type-578",
+   "self_type" : "type-582",
    "size" : 344,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17828,8 +17894,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-550",
-   "self_type" : "type-556",
+   "referenced_type" : "type-547",
+   "self_type" : "type-553",
    "size" : 248,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17838,8 +17904,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-563",
+   "referenced_type" : "type-105",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17855,120 +17921,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-128",
+   "self_type" : "type-127",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1575",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1615",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1785",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1786",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-2083",
+   "self_type" : "type-2082",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2081",
-   "self_type" : "type-2080",
+   "referenced_type" : "type-2175",
+   "self_type" : "type-2174",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2172",
-   "self_type" : "type-2171",
+   "referenced_type" : "type-2251",
+   "self_type" : "type-2250",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2249",
-   "self_type" : "type-2248",
+   "referenced_type" : "type-2293",
+   "self_type" : "type-2292",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2291",
-   "self_type" : "type-2290",
+   "referenced_type" : "type-2344",
+   "self_type" : "type-2343",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2342",
-   "self_type" : "type-2341",
+   "referenced_type" : "type-2476",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2474",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-39",
+   "self_type" : "type-38",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-413",
-   "self_type" : "type-412",
+   "referenced_type" : "type-410",
+   "self_type" : "type-409",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17983,16 +18049,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-748",
+   "referenced_type" : "type-750",
+   "self_type" : "type-749",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-856",
-   "self_type" : "type-855",
+   "referenced_type" : "type-858",
+   "self_type" : "type-857",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18026,7 +18092,7 @@
    "is_const" : true,
    "linker_set_key" : "const long",
    "name" : "const long",
-   "referenced_type" : "type-286",
+   "referenced_type" : "type-12",
    "self_type" : "type-848",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18036,8 +18102,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-145",
+   "self_type" : "type-144",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18046,8 +18112,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-141",
-   "self_type" : "type-696",
+   "referenced_type" : "type-143",
+   "self_type" : "type-699",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18057,7 +18123,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-603",
-   "self_type" : "type-826",
+   "self_type" : "type-825",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18086,8 +18152,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18096,8 +18162,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2120",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2118",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18116,8 +18182,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18126,8 +18192,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18136,8 +18202,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18146,8 +18212,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1957",
-   "self_type" : "type-1956",
+   "referenced_type" : "type-1959",
+   "self_type" : "type-1958",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18156,8 +18222,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2088",
-   "self_type" : "type-2087",
+   "referenced_type" : "type-2091",
+   "self_type" : "type-2090",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18166,8 +18232,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2186",
-   "self_type" : "type-2185",
+   "referenced_type" : "type-2189",
+   "self_type" : "type-2188",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18176,8 +18242,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2256",
-   "self_type" : "type-2255",
+   "referenced_type" : "type-2258",
+   "self_type" : "type-2257",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18186,8 +18252,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2296",
-   "self_type" : "type-2295",
+   "referenced_type" : "type-2298",
+   "self_type" : "type-2297",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18196,8 +18262,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2347",
-   "self_type" : "type-2346",
+   "referenced_type" : "type-2349",
+   "self_type" : "type-2348",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18206,8 +18272,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18216,8 +18282,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-303",
-   "self_type" : "type-302",
+   "referenced_type" : "type-300",
+   "self_type" : "type-299",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18226,8 +18292,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-443",
-   "self_type" : "type-442",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18246,8 +18312,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-763",
-   "self_type" : "type-762",
+   "referenced_type" : "type-765",
+   "self_type" : "type-764",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18256,8 +18322,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-867",
-   "self_type" : "type-866",
+   "referenced_type" : "type-868",
+   "self_type" : "type-867",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18266,8 +18332,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-923",
-   "self_type" : "type-922",
+   "referenced_type" : "type-924",
+   "self_type" : "type-923",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18306,8 +18372,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18316,8 +18382,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18326,8 +18392,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18336,8 +18402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1964",
-   "self_type" : "type-1963",
+   "referenced_type" : "type-1966",
+   "self_type" : "type-1965",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18346,8 +18412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2094",
-   "self_type" : "type-2093",
+   "referenced_type" : "type-2097",
+   "self_type" : "type-2096",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18356,8 +18422,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2193",
-   "self_type" : "type-2192",
+   "referenced_type" : "type-2196",
+   "self_type" : "type-2195",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18366,8 +18432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2262",
-   "self_type" : "type-2261",
+   "referenced_type" : "type-2264",
+   "self_type" : "type-2263",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18376,8 +18442,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2302",
-   "self_type" : "type-2301",
+   "referenced_type" : "type-2304",
+   "self_type" : "type-2303",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18386,8 +18452,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2353",
-   "self_type" : "type-2352",
+   "referenced_type" : "type-2355",
+   "self_type" : "type-2354",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18396,8 +18462,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18406,8 +18472,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-309",
-   "self_type" : "type-308",
+   "referenced_type" : "type-307",
+   "self_type" : "type-306",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18416,8 +18482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18426,8 +18492,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-659",
-   "self_type" : "type-658",
+   "referenced_type" : "type-660",
+   "self_type" : "type-659",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18436,8 +18502,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-769",
-   "self_type" : "type-768",
+   "referenced_type" : "type-771",
+   "self_type" : "type-770",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18446,8 +18512,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-873",
-   "self_type" : "type-872",
+   "referenced_type" : "type-874",
+   "self_type" : "type-873",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18456,8 +18522,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-930",
-   "self_type" : "type-929",
+   "referenced_type" : "type-931",
+   "self_type" : "type-930",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18466,8 +18532,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1004",
-   "self_type" : "type-1003",
+   "referenced_type" : "type-1005",
+   "self_type" : "type-1004",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18486,8 +18552,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18496,8 +18562,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18506,8 +18572,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18516,8 +18582,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1966",
-   "self_type" : "type-1965",
+   "referenced_type" : "type-1968",
+   "self_type" : "type-1967",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18526,8 +18592,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2096",
-   "self_type" : "type-2095",
+   "referenced_type" : "type-2099",
+   "self_type" : "type-2098",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18536,8 +18602,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2195",
-   "self_type" : "type-2194",
+   "referenced_type" : "type-2198",
+   "self_type" : "type-2197",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18546,8 +18612,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2264",
-   "self_type" : "type-2263",
+   "referenced_type" : "type-2266",
+   "self_type" : "type-2265",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18556,8 +18622,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2304",
-   "self_type" : "type-2303",
+   "referenced_type" : "type-2306",
+   "self_type" : "type-2305",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18566,8 +18632,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2355",
-   "self_type" : "type-2354",
+   "referenced_type" : "type-2357",
+   "self_type" : "type-2356",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18576,8 +18642,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18586,8 +18652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-312",
-   "self_type" : "type-311",
+   "referenced_type" : "type-309",
+   "self_type" : "type-308",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18596,8 +18662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18606,8 +18672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-660",
+   "referenced_type" : "type-662",
+   "self_type" : "type-661",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18626,8 +18692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18636,8 +18702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-932",
-   "self_type" : "type-931",
+   "referenced_type" : "type-933",
+   "self_type" : "type-932",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18666,8 +18732,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18676,8 +18742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18686,8 +18752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18696,8 +18762,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1962",
-   "self_type" : "type-1961",
+   "referenced_type" : "type-1963",
+   "self_type" : "type-1962",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18706,8 +18772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2092",
-   "self_type" : "type-2091",
+   "referenced_type" : "type-2095",
+   "self_type" : "type-2094",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18716,8 +18782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2190",
-   "self_type" : "type-2189",
+   "referenced_type" : "type-2193",
+   "self_type" : "type-2192",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18726,8 +18792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2260",
-   "self_type" : "type-2259",
+   "referenced_type" : "type-2262",
+   "self_type" : "type-2261",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18736,8 +18802,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2300",
-   "self_type" : "type-2299",
+   "referenced_type" : "type-2302",
+   "self_type" : "type-2301",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18746,8 +18812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2351",
-   "self_type" : "type-2350",
+   "referenced_type" : "type-2353",
+   "self_type" : "type-2352",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18756,8 +18822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18766,8 +18832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-307",
-   "self_type" : "type-306",
+   "referenced_type" : "type-304",
+   "self_type" : "type-303",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18776,8 +18842,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18786,8 +18852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-657",
-   "self_type" : "type-656",
+   "referenced_type" : "type-658",
+   "self_type" : "type-657",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18796,8 +18862,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-767",
-   "self_type" : "type-766",
+   "referenced_type" : "type-769",
+   "self_type" : "type-768",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18806,8 +18872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-871",
-   "self_type" : "type-870",
+   "referenced_type" : "type-872",
+   "self_type" : "type-871",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18816,8 +18882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18826,8 +18892,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1006",
-   "self_type" : "type-1005",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1006",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18846,8 +18912,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18856,8 +18922,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18866,8 +18932,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18876,8 +18942,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1968",
-   "self_type" : "type-1967",
+   "referenced_type" : "type-1970",
+   "self_type" : "type-1969",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18886,8 +18952,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2099",
-   "self_type" : "type-2098",
+   "referenced_type" : "type-2103",
+   "self_type" : "type-2102",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18896,8 +18962,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2197",
-   "self_type" : "type-2196",
+   "referenced_type" : "type-2200",
+   "self_type" : "type-2199",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18906,8 +18972,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2266",
-   "self_type" : "type-2265",
+   "referenced_type" : "type-2268",
+   "self_type" : "type-2267",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18916,8 +18982,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2306",
-   "self_type" : "type-2305",
+   "referenced_type" : "type-2308",
+   "self_type" : "type-2307",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18926,8 +18992,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2357",
-   "self_type" : "type-2356",
+   "referenced_type" : "type-2359",
+   "self_type" : "type-2358",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18936,8 +19002,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2522",
-   "self_type" : "type-2521",
+   "referenced_type" : "type-2524",
+   "self_type" : "type-2523",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18946,8 +19012,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-314",
-   "self_type" : "type-313",
+   "referenced_type" : "type-311",
+   "self_type" : "type-310",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18956,8 +19022,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-454",
-   "self_type" : "type-453",
+   "referenced_type" : "type-451",
+   "self_type" : "type-450",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18986,8 +19052,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-878",
-   "self_type" : "type-877",
+   "referenced_type" : "type-879",
+   "self_type" : "type-878",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18996,8 +19062,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-934",
-   "self_type" : "type-933",
+   "referenced_type" : "type-935",
+   "self_type" : "type-934",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19016,8 +19082,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19026,8 +19092,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19036,8 +19102,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19046,8 +19112,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1955",
-   "self_type" : "type-1954",
+   "referenced_type" : "type-1957",
+   "self_type" : "type-1956",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19056,8 +19122,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2086",
-   "self_type" : "type-2085",
+   "referenced_type" : "type-2088",
+   "self_type" : "type-2087",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19066,8 +19132,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2184",
-   "self_type" : "type-2183",
+   "referenced_type" : "type-2187",
+   "self_type" : "type-2186",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19076,8 +19142,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2254",
-   "self_type" : "type-2253",
+   "referenced_type" : "type-2256",
+   "self_type" : "type-2255",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19086,8 +19152,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2294",
-   "self_type" : "type-2293",
+   "referenced_type" : "type-2296",
+   "self_type" : "type-2295",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19096,8 +19162,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2345",
-   "self_type" : "type-2344",
+   "referenced_type" : "type-2347",
+   "self_type" : "type-2346",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19106,8 +19172,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19116,8 +19182,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-301",
-   "self_type" : "type-300",
+   "referenced_type" : "type-298",
+   "self_type" : "type-297",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19126,8 +19192,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-441",
-   "self_type" : "type-440",
+   "referenced_type" : "type-438",
+   "self_type" : "type-437",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19136,8 +19202,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-649",
+   "referenced_type" : "type-651",
+   "self_type" : "type-650",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19156,8 +19222,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-864",
-   "self_type" : "type-863",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19166,8 +19232,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-921",
-   "self_type" : "type-920",
+   "referenced_type" : "type-922",
+   "self_type" : "type-921",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19196,8 +19262,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19206,8 +19272,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19216,8 +19282,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19226,8 +19292,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1960",
-   "self_type" : "type-1959",
+   "referenced_type" : "type-1961",
+   "self_type" : "type-1960",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19236,8 +19302,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2090",
-   "self_type" : "type-2089",
+   "referenced_type" : "type-2093",
+   "self_type" : "type-2092",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19246,8 +19312,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2188",
-   "self_type" : "type-2187",
+   "referenced_type" : "type-2191",
+   "self_type" : "type-2190",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19256,8 +19322,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2258",
-   "self_type" : "type-2257",
+   "referenced_type" : "type-2260",
+   "self_type" : "type-2259",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19266,8 +19332,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2298",
-   "self_type" : "type-2297",
+   "referenced_type" : "type-2300",
+   "self_type" : "type-2299",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19276,8 +19342,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2349",
-   "self_type" : "type-2348",
+   "referenced_type" : "type-2351",
+   "self_type" : "type-2350",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19286,8 +19352,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19296,8 +19362,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-305",
-   "self_type" : "type-304",
+   "referenced_type" : "type-302",
+   "self_type" : "type-301",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19306,8 +19372,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-445",
-   "self_type" : "type-444",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19326,8 +19392,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-765",
-   "self_type" : "type-764",
+   "referenced_type" : "type-767",
+   "self_type" : "type-766",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19336,8 +19402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-869",
-   "self_type" : "type-868",
+   "referenced_type" : "type-870",
+   "self_type" : "type-869",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19346,8 +19412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-925",
-   "self_type" : "type-924",
+   "referenced_type" : "type-926",
+   "self_type" : "type-925",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19366,8 +19432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1011",
-   "self_type" : "type-1010",
+   "referenced_type" : "type-1013",
+   "self_type" : "type-1012",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19386,8 +19452,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1701",
-   "self_type" : "type-1700",
+   "referenced_type" : "type-1702",
+   "self_type" : "type-1701",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19396,8 +19462,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19406,8 +19472,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19416,8 +19482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1973",
-   "self_type" : "type-1972",
+   "referenced_type" : "type-1975",
+   "self_type" : "type-1974",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19426,8 +19492,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2105",
-   "self_type" : "type-2104",
+   "referenced_type" : "type-2107",
+   "self_type" : "type-2106",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19436,8 +19502,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2202",
-   "self_type" : "type-2201",
+   "referenced_type" : "type-2205",
+   "self_type" : "type-2204",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19446,8 +19512,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2270",
-   "self_type" : "type-2269",
+   "referenced_type" : "type-2272",
+   "self_type" : "type-2271",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19456,8 +19522,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2310",
-   "self_type" : "type-2309",
+   "referenced_type" : "type-2312",
+   "self_type" : "type-2311",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19466,8 +19532,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2361",
-   "self_type" : "type-2360",
+   "referenced_type" : "type-2363",
+   "self_type" : "type-2362",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19476,8 +19542,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19486,8 +19552,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-319",
-   "self_type" : "type-318",
+   "referenced_type" : "type-316",
+   "self_type" : "type-315",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19496,8 +19562,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-458",
-   "self_type" : "type-457",
+   "referenced_type" : "type-455",
+   "self_type" : "type-454",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19506,8 +19572,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-667",
+   "referenced_type" : "type-669",
+   "self_type" : "type-668",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19516,8 +19582,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-779",
-   "self_type" : "type-778",
+   "referenced_type" : "type-780",
+   "self_type" : "type-779",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19526,8 +19592,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-883",
-   "self_type" : "type-882",
+   "referenced_type" : "type-884",
+   "self_type" : "type-883",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19536,8 +19602,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-939",
-   "self_type" : "type-938",
+   "referenced_type" : "type-940",
+   "self_type" : "type-939",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19546,8 +19612,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1014",
+   "referenced_type" : "type-1017",
+   "self_type" : "type-1016",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19566,8 +19632,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1705",
-   "self_type" : "type-1704",
+   "referenced_type" : "type-1706",
+   "self_type" : "type-1705",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19576,8 +19642,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19586,8 +19652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19596,8 +19662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1978",
-   "self_type" : "type-1977",
+   "referenced_type" : "type-1979",
+   "self_type" : "type-1978",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19606,8 +19672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2109",
-   "self_type" : "type-2108",
+   "referenced_type" : "type-2111",
+   "self_type" : "type-2110",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19616,8 +19682,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2209",
+   "self_type" : "type-2208",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19626,8 +19692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2274",
-   "self_type" : "type-2273",
+   "referenced_type" : "type-2276",
+   "self_type" : "type-2275",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19636,8 +19702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2314",
-   "self_type" : "type-2313",
+   "referenced_type" : "type-2316",
+   "self_type" : "type-2315",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19646,8 +19712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2365",
-   "self_type" : "type-2364",
+   "referenced_type" : "type-2367",
+   "self_type" : "type-2366",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19656,8 +19722,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19666,8 +19732,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-323",
-   "self_type" : "type-322",
+   "referenced_type" : "type-320",
+   "self_type" : "type-319",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19676,8 +19742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19686,8 +19752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-673",
-   "self_type" : "type-672",
+   "referenced_type" : "type-674",
+   "self_type" : "type-673",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19696,8 +19762,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-783",
-   "self_type" : "type-782",
+   "referenced_type" : "type-784",
+   "self_type" : "type-783",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19706,8 +19772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-887",
-   "self_type" : "type-886",
+   "referenced_type" : "type-888",
+   "self_type" : "type-887",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19716,8 +19782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19726,8 +19792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1013",
-   "self_type" : "type-1012",
+   "referenced_type" : "type-1015",
+   "self_type" : "type-1014",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19746,8 +19812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1703",
-   "self_type" : "type-1702",
+   "referenced_type" : "type-1704",
+   "self_type" : "type-1703",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19756,8 +19822,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19766,8 +19832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19776,8 +19842,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1975",
-   "self_type" : "type-1974",
+   "referenced_type" : "type-1977",
+   "self_type" : "type-1976",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19786,8 +19852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2107",
-   "self_type" : "type-2106",
+   "referenced_type" : "type-2109",
+   "self_type" : "type-2108",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19796,8 +19862,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2204",
-   "self_type" : "type-2203",
+   "referenced_type" : "type-2207",
+   "self_type" : "type-2206",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19806,8 +19872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2272",
-   "self_type" : "type-2271",
+   "referenced_type" : "type-2274",
+   "self_type" : "type-2273",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19816,8 +19882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2312",
-   "self_type" : "type-2311",
+   "referenced_type" : "type-2314",
+   "self_type" : "type-2313",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19826,8 +19892,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2363",
-   "self_type" : "type-2362",
+   "referenced_type" : "type-2365",
+   "self_type" : "type-2364",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19836,8 +19902,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19846,8 +19912,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-321",
-   "self_type" : "type-320",
+   "referenced_type" : "type-318",
+   "self_type" : "type-317",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19856,8 +19922,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-460",
-   "self_type" : "type-459",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19876,8 +19942,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-780",
+   "referenced_type" : "type-782",
+   "self_type" : "type-781",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19886,8 +19952,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-885",
-   "self_type" : "type-884",
+   "referenced_type" : "type-886",
+   "self_type" : "type-885",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19896,8 +19962,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-941",
-   "self_type" : "type-940",
+   "referenced_type" : "type-942",
+   "self_type" : "type-941",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19906,8 +19972,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1009",
-   "self_type" : "type-1008",
+   "referenced_type" : "type-1011",
+   "self_type" : "type-1010",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19926,8 +19992,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1700",
+   "self_type" : "type-1699",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19936,8 +20002,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19946,8 +20012,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19956,8 +20022,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1971",
-   "self_type" : "type-1970",
+   "referenced_type" : "type-1973",
+   "self_type" : "type-1972",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19966,8 +20032,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2101",
-   "self_type" : "type-2100",
+   "referenced_type" : "type-2105",
+   "self_type" : "type-2104",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19976,8 +20042,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2200",
-   "self_type" : "type-2199",
+   "referenced_type" : "type-2203",
+   "self_type" : "type-2202",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19986,8 +20052,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2268",
-   "self_type" : "type-2267",
+   "referenced_type" : "type-2270",
+   "self_type" : "type-2269",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19996,8 +20062,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2308",
-   "self_type" : "type-2307",
+   "referenced_type" : "type-2310",
+   "self_type" : "type-2309",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20006,8 +20072,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2359",
-   "self_type" : "type-2358",
+   "referenced_type" : "type-2361",
+   "self_type" : "type-2360",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20016,8 +20082,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20026,8 +20092,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-316",
-   "self_type" : "type-315",
+   "referenced_type" : "type-314",
+   "self_type" : "type-313",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20036,8 +20102,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-456",
-   "self_type" : "type-455",
+   "referenced_type" : "type-453",
+   "self_type" : "type-452",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20046,8 +20112,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-666",
-   "self_type" : "type-665",
+   "referenced_type" : "type-667",
+   "self_type" : "type-666",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20066,8 +20132,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20076,8 +20142,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-937",
-   "self_type" : "type-936",
+   "referenced_type" : "type-938",
+   "self_type" : "type-937",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20086,8 +20152,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1017",
-   "self_type" : "type-1016",
+   "referenced_type" : "type-1019",
+   "self_type" : "type-1018",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20106,8 +20172,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1707",
-   "self_type" : "type-1706",
+   "referenced_type" : "type-1708",
+   "self_type" : "type-1707",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20116,8 +20182,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20126,8 +20192,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20136,8 +20202,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1980",
-   "self_type" : "type-1979",
+   "referenced_type" : "type-1981",
+   "self_type" : "type-1980",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20146,8 +20212,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2111",
-   "self_type" : "type-2110",
+   "referenced_type" : "type-2113",
+   "self_type" : "type-2112",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20156,8 +20222,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2209",
-   "self_type" : "type-2208",
+   "referenced_type" : "type-2213",
+   "self_type" : "type-2212",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20166,8 +20232,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2276",
-   "self_type" : "type-2275",
+   "referenced_type" : "type-2278",
+   "self_type" : "type-2277",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20176,8 +20242,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2316",
-   "self_type" : "type-2315",
+   "referenced_type" : "type-2318",
+   "self_type" : "type-2317",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20186,8 +20252,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2367",
-   "self_type" : "type-2366",
+   "referenced_type" : "type-2369",
+   "self_type" : "type-2368",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20196,8 +20262,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2536",
-   "self_type" : "type-2535",
+   "referenced_type" : "type-2538",
+   "self_type" : "type-2537",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20206,8 +20272,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-325",
-   "self_type" : "type-324",
+   "referenced_type" : "type-322",
+   "self_type" : "type-321",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20216,8 +20282,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-463",
+   "self_type" : "type-462",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20226,8 +20292,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-674",
+   "referenced_type" : "type-676",
+   "self_type" : "type-675",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20246,8 +20312,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-889",
-   "self_type" : "type-888",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20256,8 +20322,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-946",
-   "self_type" : "type-945",
+   "referenced_type" : "type-947",
+   "self_type" : "type-946",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20266,8 +20332,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1027",
-   "self_type" : "type-1026",
+   "referenced_type" : "type-1028",
+   "self_type" : "type-1027",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20286,8 +20352,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20296,8 +20362,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1989",
-   "self_type" : "type-1988",
+   "referenced_type" : "type-1991",
+   "self_type" : "type-1990",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20306,8 +20372,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2219",
-   "self_type" : "type-2218",
+   "referenced_type" : "type-2221",
+   "self_type" : "type-2220",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20316,8 +20382,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2284",
-   "self_type" : "type-2283",
+   "referenced_type" : "type-2286",
+   "self_type" : "type-2285",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20326,8 +20392,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2324",
-   "self_type" : "type-2323",
+   "referenced_type" : "type-2326",
+   "self_type" : "type-2325",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20336,8 +20402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2375",
-   "self_type" : "type-2374",
+   "referenced_type" : "type-2377",
+   "self_type" : "type-2376",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20346,8 +20412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20356,8 +20422,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-474",
-   "self_type" : "type-473",
+   "referenced_type" : "type-471",
+   "self_type" : "type-470",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20366,8 +20432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-794",
+   "referenced_type" : "type-796",
+   "self_type" : "type-795",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20376,8 +20442,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-899",
-   "self_type" : "type-898",
+   "referenced_type" : "type-900",
+   "self_type" : "type-899",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20386,8 +20452,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-955",
-   "self_type" : "type-954",
+   "referenced_type" : "type-956",
+   "self_type" : "type-955",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20416,8 +20482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20426,8 +20492,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1987",
-   "self_type" : "type-1986",
+   "referenced_type" : "type-1988",
+   "self_type" : "type-1987",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20436,8 +20502,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2217",
-   "self_type" : "type-2216",
+   "referenced_type" : "type-2219",
+   "self_type" : "type-2218",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20446,8 +20512,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2282",
-   "self_type" : "type-2281",
+   "referenced_type" : "type-2284",
+   "self_type" : "type-2283",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20456,8 +20522,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2322",
-   "self_type" : "type-2321",
+   "referenced_type" : "type-2324",
+   "self_type" : "type-2323",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20466,8 +20532,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2373",
-   "self_type" : "type-2372",
+   "referenced_type" : "type-2375",
+   "self_type" : "type-2374",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20476,8 +20542,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20486,8 +20552,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-472",
-   "self_type" : "type-471",
+   "referenced_type" : "type-469",
+   "self_type" : "type-468",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20496,8 +20562,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-793",
-   "self_type" : "type-792",
+   "referenced_type" : "type-794",
+   "self_type" : "type-793",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20506,8 +20572,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-897",
-   "self_type" : "type-896",
+   "referenced_type" : "type-898",
+   "self_type" : "type-897",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20516,8 +20582,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-953",
-   "self_type" : "type-952",
+   "referenced_type" : "type-954",
+   "self_type" : "type-953",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20546,8 +20612,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20556,8 +20622,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1985",
-   "self_type" : "type-1984",
+   "referenced_type" : "type-1986",
+   "self_type" : "type-1985",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20566,8 +20632,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2215",
-   "self_type" : "type-2214",
+   "referenced_type" : "type-2217",
+   "self_type" : "type-2216",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20576,8 +20642,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2280",
-   "self_type" : "type-2279",
+   "referenced_type" : "type-2282",
+   "self_type" : "type-2281",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20586,8 +20652,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2320",
-   "self_type" : "type-2319",
+   "referenced_type" : "type-2322",
+   "self_type" : "type-2321",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20596,8 +20662,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2371",
-   "self_type" : "type-2370",
+   "referenced_type" : "type-2373",
+   "self_type" : "type-2372",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20606,8 +20672,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20616,8 +20682,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-470",
-   "self_type" : "type-469",
+   "referenced_type" : "type-467",
+   "self_type" : "type-466",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20626,8 +20692,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-791",
-   "self_type" : "type-790",
+   "referenced_type" : "type-792",
+   "self_type" : "type-791",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20636,8 +20702,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-895",
-   "self_type" : "type-894",
+   "referenced_type" : "type-896",
+   "self_type" : "type-895",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20646,8 +20712,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20676,8 +20742,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20686,8 +20752,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1982",
-   "self_type" : "type-1981",
+   "referenced_type" : "type-1984",
+   "self_type" : "type-1983",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20696,8 +20762,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2213",
-   "self_type" : "type-2212",
+   "referenced_type" : "type-2215",
+   "self_type" : "type-2214",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20706,8 +20772,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2278",
-   "self_type" : "type-2277",
+   "referenced_type" : "type-2280",
+   "self_type" : "type-2279",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20716,8 +20782,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2318",
-   "self_type" : "type-2317",
+   "referenced_type" : "type-2320",
+   "self_type" : "type-2319",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20726,8 +20792,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2369",
-   "self_type" : "type-2368",
+   "referenced_type" : "type-2371",
+   "self_type" : "type-2370",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20736,8 +20802,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20746,8 +20812,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-465",
+   "self_type" : "type-464",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20766,8 +20832,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20776,8 +20842,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-948",
-   "self_type" : "type-947",
+   "referenced_type" : "type-949",
+   "self_type" : "type-948",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20786,8 +20852,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1029",
-   "self_type" : "type-1028",
+   "referenced_type" : "type-1030",
+   "self_type" : "type-1029",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20806,8 +20872,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20816,8 +20882,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1991",
-   "self_type" : "type-1990",
+   "referenced_type" : "type-1993",
+   "self_type" : "type-1992",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20826,8 +20892,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2221",
-   "self_type" : "type-2220",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2223",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20836,8 +20902,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2285",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2287",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20846,8 +20912,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2326",
-   "self_type" : "type-2325",
+   "referenced_type" : "type-2328",
+   "self_type" : "type-2327",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20856,8 +20922,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2377",
-   "self_type" : "type-2376",
+   "referenced_type" : "type-2379",
+   "self_type" : "type-2378",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20866,8 +20932,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2550",
-   "self_type" : "type-2549",
+   "referenced_type" : "type-2552",
+   "self_type" : "type-2551",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20876,8 +20942,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-475",
+   "referenced_type" : "type-473",
+   "self_type" : "type-472",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20886,8 +20952,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-797",
-   "self_type" : "type-796",
+   "referenced_type" : "type-798",
+   "self_type" : "type-797",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20896,8 +20962,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-901",
-   "self_type" : "type-900",
+   "referenced_type" : "type-902",
+   "self_type" : "type-901",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20906,8 +20972,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-957",
-   "self_type" : "type-956",
+   "referenced_type" : "type-958",
+   "self_type" : "type-957",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20916,8 +20982,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1632",
-   "self_type" : "type-1631",
+   "referenced_type" : "type-1636",
+   "self_type" : "type-1635",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20926,8 +20992,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-167",
-   "self_type" : "type-166",
+   "referenced_type" : "type-169",
+   "self_type" : "type-168",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20936,8 +21002,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20946,8 +21012,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1944",
-   "self_type" : "type-1943",
+   "referenced_type" : "type-1945",
+   "self_type" : "type-1944",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20956,8 +21022,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2084",
-   "self_type" : "type-2083",
+   "referenced_type" : "type-2086",
+   "self_type" : "type-2085",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20966,8 +21032,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2180",
-   "self_type" : "type-2179",
+   "referenced_type" : "type-2183",
+   "self_type" : "type-2182",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20976,8 +21042,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2252",
-   "self_type" : "type-2251",
+   "referenced_type" : "type-2254",
+   "self_type" : "type-2253",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20986,8 +21052,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-428",
-   "self_type" : "type-427",
+   "referenced_type" : "type-425",
+   "self_type" : "type-424",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20996,8 +21062,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-646",
+   "referenced_type" : "type-648",
+   "self_type" : "type-647",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21006,8 +21072,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-756",
+   "referenced_type" : "type-758",
+   "self_type" : "type-757",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21026,8 +21092,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1019",
-   "self_type" : "type-1018",
+   "referenced_type" : "type-1009",
+   "self_type" : "type-1008",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21036,8 +21102,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21046,8 +21112,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2103",
-   "self_type" : "type-2102",
+   "referenced_type" : "type-2101",
+   "self_type" : "type-2100",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21056,8 +21122,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1757",
-   "self_type" : "type-1756",
+   "referenced_type" : "type-1758",
+   "self_type" : "type-1757",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21066,8 +21132,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21076,46 +21142,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2405",
-   "self_type" : "type-2404",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-771",
-   "self_type" : "type-770",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1947",
-   "self_type" : "type-1946",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2407",
    "self_type" : "type-2406",
    "size" : 4,
@@ -21124,10 +21150,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-763",
+   "self_type" : "type-762",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-859",
-   "self_type" : "type-858",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1948",
+   "self_type" : "type-1947",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-856",
+   "self_type" : "type-855",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21146,8 +21212,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21156,8 +21222,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2224",
-   "self_type" : "type-2223",
+   "referenced_type" : "type-2226",
+   "self_type" : "type-2225",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21166,8 +21232,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21176,8 +21242,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21186,8 +21252,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2664",
-   "self_type" : "type-2663",
+   "referenced_type" : "type-2669",
+   "self_type" : "type-2668",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21196,8 +21262,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2332",
-   "self_type" : "type-2331",
+   "referenced_type" : "type-2334",
+   "self_type" : "type-2333",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21216,8 +21282,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1033",
-   "self_type" : "type-1032",
+   "referenced_type" : "type-1034",
+   "self_type" : "type-1033",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21236,8 +21302,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21246,8 +21312,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21256,8 +21322,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21266,8 +21332,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21276,8 +21342,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21286,8 +21352,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1995",
-   "self_type" : "type-1994",
+   "referenced_type" : "type-1996",
+   "self_type" : "type-1995",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21296,8 +21362,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2076",
-   "self_type" : "type-2075",
+   "referenced_type" : "type-2078",
+   "self_type" : "type-2077",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21306,8 +21372,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2151",
-   "self_type" : "type-2150",
+   "referenced_type" : "type-2154",
+   "self_type" : "type-2153",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21316,8 +21382,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2234",
-   "self_type" : "type-2233",
+   "referenced_type" : "type-2236",
+   "self_type" : "type-2235",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21326,8 +21392,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2329",
-   "self_type" : "type-2328",
+   "referenced_type" : "type-2331",
+   "self_type" : "type-2330",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21336,8 +21402,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2379",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2381",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21346,8 +21412,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2567",
-   "self_type" : "type-2566",
+   "referenced_type" : "type-2569",
+   "self_type" : "type-2568",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21356,8 +21422,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-330",
-   "self_type" : "type-329",
+   "referenced_type" : "type-327",
+   "self_type" : "type-326",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21366,8 +21432,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-43",
-   "self_type" : "type-42",
+   "referenced_type" : "type-477",
+   "self_type" : "type-476",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21376,8 +21442,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-480",
-   "self_type" : "type-479",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21396,8 +21462,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21406,8 +21472,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-834",
-   "self_type" : "type-833",
+   "referenced_type" : "type-835",
+   "self_type" : "type-834",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21416,8 +21482,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-964",
-   "self_type" : "type-963",
+   "referenced_type" : "type-966",
+   "self_type" : "type-965",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21426,8 +21492,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-207",
-   "self_type" : "type-214",
+   "referenced_type" : "type-220",
+   "self_type" : "type-227",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21436,8 +21502,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-237",
+   "referenced_type" : "type-125",
+   "self_type" : "type-239",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21446,8 +21512,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long",
    "name" : "const unsigned long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-238",
+   "referenced_type" : "type-126",
+   "self_type" : "type-240",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21456,8 +21522,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-209",
-   "self_type" : "type-216",
+   "referenced_type" : "type-222",
+   "self_type" : "type-229",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -21475,7 +21541,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-150",
+   "referenced_type" : "type-153",
    "self_type" : "type-1119",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21484,8 +21550,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned long const[3]",
    "name" : "unsigned long const[3]",
-   "referenced_type" : "type-944",
-   "self_type" : "type-951",
+   "referenced_type" : "type-936",
+   "self_type" : "type-945",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21495,7 +21561,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-272",
+   "self_type" : "type-268",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21504,8 +21570,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-277",
+   "referenced_type" : "type-105",
+   "self_type" : "type-273",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21518,48 +21584,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-684",
-   "self_type" : "type-684",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21570,23 +21636,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21597,18 +21663,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 64,
-     "referenced_type" : "type-509"
+     "referenced_type" : "type-507"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-508",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 72,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21619,63 +21685,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "width",
      "field_offset" : 448,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 480,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 512,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 544,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 576,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 640,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 704,
-     "referenced_type" : "type-525"
+     "referenced_type" : "type-522"
     },
     {
      "field_name" : "handle",
      "field_offset" : 768,
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "usage",
      "field_offset" : 832,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 896,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-519",
-   "self_type" : "type-519",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 168,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21686,22 +21752,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21718,7 +21784,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "alloc",
@@ -21738,7 +21804,7 @@
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1152,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-523"
     }
    ],
    "linker_set_key" : "alloc_device_t",
@@ -21754,20 +21820,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-516"
     },
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 184,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-519", "type-527", "type-171", "type-520" ],
+   "template_args" : [ "type-516", "type-524", "type-174", "type-517" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21962,14 +22028,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-261"
+     "referenced_type" : "type-257"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -22010,13 +22076,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22028,14 +22094,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 448,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22045,14 +22111,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22062,13 +22128,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22080,20 +22146,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1403"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 320,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1404"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1402",
+   "self_type" : "type-1402",
    "size" : 88,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22105,20 +22171,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 320,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1403",
-   "self_type" : "type-1403",
+   "referenced_type" : "type-1407",
+   "self_type" : "type-1407",
    "size" : 80,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22140,11 +22206,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22152,11 +22218,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-524" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22208,36 +22274,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 704,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 128,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22247,7 +22313,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-361"
+     "referenced_type" : "type-358"
     }
    ],
    "fields" :
@@ -22256,20 +22322,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 64,
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 128,
-     "referenced_type" : "type-357"
+     "referenced_type" : "type-354"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22306,7 +22372,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     }
    ],
    "fields" :
@@ -22315,20 +22381,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 64,
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 128,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22386,10 +22452,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-534"
+     "referenced_type" : "type-531"
     }
    ],
    "fields" :
@@ -22398,62 +22464,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 1472,
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 1536,
-     "referenced_type" : "type-528"
+     "referenced_type" : "type-525"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 1600,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 1664,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 1696,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 1728,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1824,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1856,
-     "referenced_type" : "type-533"
+     "referenced_type" : "type-530"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-524",
+   "self_type" : "type-524",
    "size" : 256,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22493,81 +22559,81 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-542"
+     "referenced_type" : "type-539"
     }
    ],
    "fields" :
    [
     {
-     "access" : "private",
+     "access" : "protected",
      "field_name" : "mMapper",
-     "referenced_type" : "type-528"
+     "referenced_type" : "type-525"
     },
     {
-     "access" : "private",
+     "access" : "protected",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-544"
+     "referenced_type" : "type-541"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator",
    "name" : "android::GraphicBufferAllocator",
    "record_kind" : "class",
-   "referenced_type" : "type-543",
-   "self_type" : "type-543",
+   "referenced_type" : "type-540",
+   "self_type" : "type-540",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "alignment" : 8,
    "fields" :
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "stride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 192,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "size",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "requestorName",
      "field_offset" : 320,
-     "referenced_type" : "type-678"
+     "referenced_type" : "type-682"
     }
    ],
    "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-677",
-   "self_type" : "type-677",
+   "referenced_type" : "type-681",
+   "self_type" : "type-681",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
    "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
@@ -22577,7 +22643,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-529"
     }
    ],
    "fields" :
@@ -22585,20 +22651,20 @@
     {
      "access" : "private",
      "field_name" : "mMapper",
-     "referenced_type" : "type-530"
+     "referenced_type" : "type-527"
     },
     {
      "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 64,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-528"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-526",
+   "self_type" : "type-526",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22608,7 +22674,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-959"
+     "referenced_type" : "type-961"
     }
    ],
    "fields" :
@@ -22616,7 +22682,7 @@
     {
      "access" : "private",
      "field_name" : "mSupportedHdrTypes",
-     "referenced_type" : "type-961"
+     "referenced_type" : "type-963"
     },
     {
      "access" : "private",
@@ -22640,8 +22706,8 @@
    "linker_set_key" : "android::HdrCapabilities",
    "name" : "android::HdrCapabilities",
    "record_kind" : "class",
-   "referenced_type" : "type-960",
-   "self_type" : "type-960",
+   "referenced_type" : "type-962",
+   "self_type" : "type-962",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h",
    "unique_id" : "_ZTSN7android15HdrCapabilitiesE"
@@ -22653,17 +22719,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "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-249",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "self_type" : "type-251",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-178", "type-250" ],
+   "template_args" : [ "type-180", "type-252" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22673,17 +22739,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-710"
+     "referenced_type" : "type-711"
     }
    ],
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22691,11 +22757,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22703,11 +22769,11 @@
    "linker_set_key" : "android::LightFlattenable<android::HdrCapabilities>",
    "name" : "android::LightFlattenable<android::HdrCapabilities>",
    "record_kind" : "class",
-   "referenced_type" : "type-959",
-   "self_type" : "type-959",
+   "referenced_type" : "type-961",
+   "self_type" : "type-961",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-960" ],
+   "template_args" : [ "type-962" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_15HdrCapabilitiesEEE"
   },
   {
@@ -22739,11 +22805,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2391",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2393",
+   "self_type" : "type-2393",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2390" ],
+   "template_args" : [ "type-2392" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22849,14 +22915,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-255"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-254",
-   "self_type" : "type-254",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22868,14 +22934,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-1378"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-257",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1377",
+   "self_type" : "type-1377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22924,12 +22990,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22948,14 +23014,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-265"
+     "referenced_type" : "type-261"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-264",
-   "self_type" : "type-264",
+   "referenced_type" : "type-260",
+   "self_type" : "type-260",
    "size" : 56,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22967,14 +23033,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-264"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-267",
-   "self_type" : "type-267",
+   "referenced_type" : "type-263",
+   "self_type" : "type-263",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22986,14 +23052,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-268"
+     "referenced_type" : "type-264"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-270",
-   "self_type" : "type-270",
+   "referenced_type" : "type-266",
+   "self_type" : "type-266",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23026,14 +23092,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 16,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23073,8 +23139,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-197",
-   "self_type" : "type-197",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23120,7 +23186,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
    "fields" :
@@ -23128,14 +23194,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2383"
+     "referenced_type" : "type-2385"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23147,7 +23213,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23164,11 +23230,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-543" ],
+   "template_args" : [ "type-540" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23176,11 +23242,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-529",
+   "self_type" : "type-529",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-529" ],
+   "template_args" : [ "type-526" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23189,17 +23255,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "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-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23247,14 +23313,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "record_kind" : "class",
-   "referenced_type" : "type-710",
-   "self_type" : "type-710",
+   "referenced_type" : "type-711",
+   "self_type" : "type-711",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
    "template_args" : [ "type-694" ],
@@ -23304,14 +23370,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23369,14 +23435,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-179"
+     "referenced_type" : "type-181"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-178",
-   "self_type" : "type-178",
+   "referenced_type" : "type-180",
+   "self_type" : "type-180",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23388,14 +23454,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-287",
-   "self_type" : "type-287",
+   "referenced_type" : "type-284",
+   "self_type" : "type-284",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23406,7 +23472,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -23415,62 +23481,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 64,
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 192,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 512,
-     "referenced_type" : "type-260"
+     "referenced_type" : "type-256"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 928,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 936,
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 960,
-     "referenced_type" : "type-369"
+     "referenced_type" : "type-366"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 1024,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 152,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23560,14 +23626,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2383",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2385",
+   "self_type" : "type-2385",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23615,17 +23681,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-248" ],
+   "template_args" : [ "type-250" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23670,17 +23736,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-246",
-   "self_type" : "type-246",
+   "referenced_type" : "type-248",
+   "self_type" : "type-248",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-199" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23725,17 +23791,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-243" ],
+   "template_args" : [ "type-245" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23780,17 +23846,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23835,17 +23901,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::Vector<long>",
    "name" : "android::Vector<long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIlEE",
    "vtable_components" :
    [
@@ -23892,32 +23958,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 64,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 192,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 256,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-236",
-   "self_type" : "type-236",
+   "referenced_type" : "type-238",
+   "self_type" : "type-238",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -24003,11 +24069,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-825",
-   "self_type" : "type-825",
+   "referenced_type" : "type-826",
+   "self_type" : "type-826",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24027,7 +24093,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24092,28 +24158,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2412"
+     "referenced_type" : "type-2414"
+    },
+    {
+     "referenced_type" : "type-2415"
     },
     {
      "referenced_type" : "type-2413"
     },
     {
-     "referenced_type" : "type-2411"
-    },
-    {
-     "referenced_type" : "type-2419"
-    },
-    {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2421"
     },
     {
      "referenced_type" : "type-2422"
     },
     {
-     "referenced_type" : "type-2421"
+     "referenced_type" : "type-2424"
     },
     {
-     "referenced_type" : "type-2424"
+     "referenced_type" : "type-2423"
+    },
+    {
+     "referenced_type" : "type-2426"
     }
    ],
    "fields" :
@@ -24121,14 +24187,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2429"
+     "referenced_type" : "type-2431"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2428",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-2430",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24151,8 +24217,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2426",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24175,8 +24241,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24199,8 +24265,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24223,8 +24289,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24247,8 +24313,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2422",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2424",
+   "self_type" : "type-2424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24259,11 +24325,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24271,8 +24337,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24283,11 +24349,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24295,8 +24361,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "type-48",
+   "self_type" : "type-48",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24307,11 +24373,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24319,8 +24385,8 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-39",
-   "self_type" : "type-39",
+   "referenced_type" : "type-41",
+   "self_type" : "type-41",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24331,38 +24397,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-339"
     },
     {
-     "referenced_type" : "type-344"
+     "referenced_type" : "type-340"
     },
     {
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-341"
     },
     {
-     "referenced_type" : "type-44"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-43"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-341"
+     "referenced_type" : "type-337"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-340",
-   "self_type" : "type-340",
+   "referenced_type" : "type-336",
+   "self_type" : "type-336",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24370,27 +24436,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-338"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-57"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-341",
-   "self_type" : "type-341",
+   "referenced_type" : "type-337",
+   "self_type" : "type-337",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24401,29 +24467,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-342",
-   "self_type" : "type-342",
+   "referenced_type" : "type-338",
+   "self_type" : "type-338",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24433,35 +24499,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-418"
+     "referenced_type" : "type-414"
     },
     {
-     "referenced_type" : "type-419"
+     "referenced_type" : "type-415"
     },
     {
-     "referenced_type" : "type-420"
+     "referenced_type" : "type-416"
     },
     {
-     "referenced_type" : "type-39"
-    },
-    {
-     "referenced_type" : "type-46"
+     "referenced_type" : "type-41"
     },
     {
      "referenced_type" : "type-48"
+    },
+    {
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-416"
+     "referenced_type" : "type-412"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24472,11 +24538,11 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-417"
+     "referenced_type" : "type-413"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-203"
     },
     {
      "field_name" : "xyz",
@@ -24491,8 +24557,8 @@
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-416",
-   "self_type" : "type-416",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24524,8 +24590,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-417",
-   "self_type" : "type-417",
+   "referenced_type" : "type-413",
+   "self_type" : "type-413",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24535,22 +24601,22 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-397"
+     "referenced_type" : "type-391"
     },
     {
-     "referenced_type" : "type-429"
+     "referenced_type" : "type-426"
     },
     {
-     "referenced_type" : "type-461"
+     "referenced_type" : "type-456"
     },
     {
-     "referenced_type" : "type-512"
+     "referenced_type" : "type-509"
     },
     {
      "referenced_type" : "type-601"
     },
     {
-     "referenced_type" : "type-645"
+     "referenced_type" : "type-644"
     }
    ],
    "fields" :
@@ -24667,44 +24733,11 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-62"
     },
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
-     "referenced_type" : "type-70"
-    },
-    {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    }
-   ],
-   "fields" :
-   [
-    {
      "referenced_type" : "type-63"
-    }
-   ],
-   "linker_set_key" : "android::details::TVec2<double>",
-   "name" : "android::details::TVec2<double>",
-   "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
-   "size" : 16,
-   "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-45" ],
-   "unique_id" : "_ZTSN7android7details5TVec2IdEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
+    },
     {
      "referenced_type" : "type-64"
     },
@@ -24713,14 +24746,47 @@
     },
     {
      "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-58"
+    }
+   ],
+   "linker_set_key" : "android::details::TVec2<double>",
+   "name" : "android::details::TVec2<double>",
+   "record_kind" : "class",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
+   "size" : 16,
+   "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
+   "template_args" : [ "type-44" ],
+   "unique_id" : "_ZTSN7android7details5TVec2IdEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24731,19 +24797,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24754,19 +24820,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24777,19 +24843,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24931,44 +24997,11 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-78"
+     "referenced_type" : "type-73"
     },
     {
-     "referenced_type" : "type-79"
-    },
-    {
-     "referenced_type" : "type-80"
-    },
-    {
-     "referenced_type" : "type-81"
-    },
-    {
-     "referenced_type" : "type-82"
-    },
-    {
-     "referenced_type" : "type-83"
-    }
-   ],
-   "fields" :
-   [
-    {
      "referenced_type" : "type-74"
-    }
-   ],
-   "linker_set_key" : "android::details::TVec3<double>",
-   "name" : "android::details::TVec3<double>",
-   "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
-   "size" : 24,
-   "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-45" ],
-   "unique_id" : "_ZTSN7android7details5TVec3IdEE"
-  },
-  {
-   "alignment" : 8,
-   "fields" :
-   [
+    },
     {
      "referenced_type" : "type-75"
     },
@@ -24979,24 +25012,57 @@
      "referenced_type" : "type-77"
     },
     {
+     "referenced_type" : "type-78"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-69"
+    }
+   ],
+   "linker_set_key" : "android::details::TVec3<double>",
+   "name" : "android::details::TVec3<double>",
+   "record_kind" : "class",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
+   "size" : 24,
+   "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
+   "template_args" : [ "type-44" ],
+   "unique_id" : "_ZTSN7android7details5TVec3IdEE"
+  },
+  {
+   "alignment" : 8,
+   "fields" :
+   [
+    {
+     "referenced_type" : "type-70"
+    },
+    {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -25007,24 +25073,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25035,24 +25101,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25063,24 +25129,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25096,13 +25162,13 @@
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-16"
+     "referenced_type" : "type-18"
     },
     {
      "referenced_type" : "type-37"
@@ -25249,38 +25315,38 @@
    "base_specifiers" :
    [
     {
+     "referenced_type" : "type-79"
+    },
+    {
+     "referenced_type" : "type-80"
+    },
+    {
+     "referenced_type" : "type-81"
+    },
+    {
+     "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
      "referenced_type" : "type-84"
-    },
-    {
-     "referenced_type" : "type-85"
-    },
-    {
-     "referenced_type" : "type-86"
-    },
-    {
-     "referenced_type" : "type-87"
-    },
-    {
-     "referenced_type" : "type-88"
-    },
-    {
-     "referenced_type" : "type-89"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-58"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25288,45 +25354,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-59"
+     "referenced_type" : "type-54"
     },
     {
-     "referenced_type" : "type-60"
+     "referenced_type" : "type-55"
     },
     {
-     "referenced_type" : "type-61"
+     "referenced_type" : "type-56"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-62"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-73"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25337,29 +25403,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25370,29 +25436,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25403,29 +25469,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-45"
+     "referenced_type" : "type-44"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25435,35 +25501,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-223"
+     "referenced_type" : "type-208"
     },
     {
-     "referenced_type" : "type-224"
+     "referenced_type" : "type-209"
     },
     {
-     "referenced_type" : "type-225"
+     "referenced_type" : "type-210"
     },
     {
-     "referenced_type" : "type-226"
+     "referenced_type" : "type-211"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-212"
     },
     {
-     "referenced_type" : "type-228"
+     "referenced_type" : "type-213"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-204"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-203",
+   "self_type" : "type-203",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25474,13 +25540,13 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-205"
     },
     {
-     "referenced_type" : "type-221"
+     "referenced_type" : "type-206"
     },
     {
-     "referenced_type" : "type-222"
+     "referenced_type" : "type-207"
     },
     {
      "field_name" : "xy",
@@ -25511,8 +25577,8 @@
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-219",
-   "self_type" : "type-219",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25544,8 +25610,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-220",
-   "self_type" : "type-220",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25577,8 +25643,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-221",
-   "self_type" : "type-221",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25610,8 +25676,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-222",
-   "self_type" : "type-222",
+   "referenced_type" : "type-207",
+   "self_type" : "type-207",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25633,8 +25699,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25645,11 +25711,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-343",
-   "self_type" : "type-343",
+   "referenced_type" : "type-339",
+   "self_type" : "type-339",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25657,8 +25723,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-418",
-   "self_type" : "type-418",
+   "referenced_type" : "type-414",
+   "self_type" : "type-414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25669,8 +25735,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-429",
-   "self_type" : "type-429",
+   "referenced_type" : "type-426",
+   "self_type" : "type-426",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25681,11 +25747,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25705,11 +25771,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25729,11 +25795,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-85",
-   "self_type" : "type-85",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25741,8 +25807,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-224",
-   "self_type" : "type-224",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25765,8 +25831,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2413",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25777,11 +25843,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-345",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-341",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25789,8 +25855,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25801,8 +25867,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25813,11 +25879,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25837,11 +25903,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25849,8 +25915,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25861,11 +25927,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-87",
-   "self_type" : "type-87",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25873,8 +25939,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-226",
-   "self_type" : "type-226",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25885,8 +25951,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "name" : "android::details::TVecDebug<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-645",
-   "self_type" : "type-645",
+   "referenced_type" : "type-644",
+   "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25897,11 +25963,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25921,11 +25987,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-83",
-   "self_type" : "type-83",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25945,11 +26011,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-89",
-   "self_type" : "type-89",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25957,8 +26023,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-213",
+   "self_type" : "type-213",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25981,11 +26047,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -26005,11 +26071,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26017,8 +26083,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-16",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26029,11 +26095,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-88",
-   "self_type" : "type-88",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26041,8 +26107,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-227",
-   "self_type" : "type-227",
+   "referenced_type" : "type-212",
+   "self_type" : "type-212",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26053,8 +26119,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-397",
-   "self_type" : "type-397",
+   "referenced_type" : "type-391",
+   "self_type" : "type-391",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26065,11 +26131,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26089,11 +26155,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26113,11 +26179,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-84",
-   "self_type" : "type-84",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26125,8 +26191,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-223",
-   "self_type" : "type-223",
+   "referenced_type" : "type-208",
+   "self_type" : "type-208",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26149,8 +26215,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2414",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26161,11 +26227,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-344",
-   "self_type" : "type-344",
+   "referenced_type" : "type-340",
+   "self_type" : "type-340",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26173,8 +26239,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-415",
+   "self_type" : "type-415",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26185,8 +26251,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-461",
-   "self_type" : "type-461",
+   "referenced_type" : "type-456",
+   "self_type" : "type-456",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26197,11 +26263,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26221,11 +26287,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26233,8 +26299,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26245,11 +26311,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26257,8 +26323,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-225",
-   "self_type" : "type-225",
+   "referenced_type" : "type-210",
+   "self_type" : "type-210",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26324,7 +26390,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26346,7 +26412,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-198"
     }
    ],
    "fields" :
@@ -26355,32 +26421,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 128,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 192,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26487,7 +26553,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -26496,26 +26562,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 64,
-     "referenced_type" : "type-193"
+     "referenced_type" : "type-196"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 128,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-199"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 192,
-     "referenced_type" : "type-198"
+     "referenced_type" : "type-201"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 48,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26604,22 +26670,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26640,7 +26706,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26728,14 +26794,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-195",
-   "self_type" : "type-195",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26845,14 +26911,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26933,14 +26999,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27022,85 +27088,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 64,
-     "referenced_type" : "type-242"
+     "referenced_type" : "type-244"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 384,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 704,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 1024,
-     "referenced_type" : "type-246"
+     "referenced_type" : "type-248"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 1344,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 2432,
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 3520,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 3552,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 3584,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 3648,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 3680,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 3712,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 3776,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
@@ -27118,26 +27184,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 3904,
-     "referenced_type" : "type-292"
+     "referenced_type" : "type-289"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 4096,
-     "referenced_type" : "type-293"
+     "referenced_type" : "type-290"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 4160,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 528,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27149,73 +27215,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 64,
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 320,
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 384,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 448,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 576,
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 640,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 704,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 768,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 832,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -27239,20 +27305,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 960,
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-223"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 1024,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 136,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27264,23 +27330,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 64,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-222"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 128,
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-222"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-229",
-   "self_type" : "type-229",
+   "referenced_type" : "type-231",
+   "self_type" : "type-231",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27291,7 +27357,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "fields" :
@@ -27300,55 +27366,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 192,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 512,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-281"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 896,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 960,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 1024,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 1088,
-     "referenced_type" : "type-254"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 1408,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
@@ -27360,25 +27426,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 1792,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 1856,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 1920,
-     "referenced_type" : "type-249"
+     "referenced_type" : "type-251"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 2240,
-     "referenced_type" : "type-287"
+     "referenced_type" : "type-284"
     },
     {
      "access" : "private",
@@ -27396,26 +27462,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 2336,
-     "referenced_type" : "type-277"
+     "referenced_type" : "type-273"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 2368,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2432,
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-283",
-   "self_type" : "type-283",
+   "referenced_type" : "type-279",
+   "self_type" : "type-279",
    "size" : 328,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27493,18 +27559,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-197"
     },
     {
      "field_name" : "refs",
      "field_offset" : 64,
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-199"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-241",
-   "self_type" : "type-241",
+   "referenced_type" : "type-243",
+   "self_type" : "type-243",
    "size" : 16,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27514,7 +27580,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27523,17 +27589,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27541,7 +27607,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27550,17 +27616,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 288,
-     "referenced_type" : "type-395"
+     "referenced_type" : "type-394"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-394",
-   "self_type" : "type-394",
+   "referenced_type" : "type-393",
+   "self_type" : "type-393",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-396" ],
+   "template_args" : [ "type-395" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27568,7 +27634,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27577,17 +27643,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 320,
-     "referenced_type" : "type-53"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 48,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-53" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27595,7 +27661,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27605,7 +27671,7 @@
    "self_type" : "type-1321",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27615,26 +27681,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 32,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27740,7 +27806,7 @@
    "self_type" : "type-1104",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLm10EJEEE"
   },
   {
@@ -27754,12 +27820,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1100",
    "self_type" : "type-1100",
@@ -27791,16 +27857,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-138"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-138" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27818,7 +27884,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-289" ],
+   "template_args" : [ "type-286" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27828,16 +27894,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1072",
    "self_type" : "type-1072",
@@ -27851,16 +27917,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-141",
+   "self_type" : "type-141",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-144" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27870,19 +27936,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27894,19 +27960,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-139"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_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<hidl_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<hidl_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<hidl_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-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27926,7 +27992,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27940,12 +28006,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1151",
    "self_type" : "type-1151",
@@ -27959,16 +28025,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27978,19 +28044,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned 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<unsigned 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<unsigned 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-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -28012,7 +28078,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28024,8 +28090,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28038,7 +28104,7 @@
    "self_type" : "type-1103",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLm10EJEEE"
   },
   {
@@ -28052,7 +28118,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28079,7 +28145,7 @@
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLm10EJEEE"
   },
   {
@@ -28088,7 +28154,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28173,33 +28239,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-151",
+   "self_type" : "type-151",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-149", "type-150" ],
+   "template_args" : [ "type-152", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-156",
-   "self_type" : "type-156",
+   "referenced_type" : "type-158",
+   "self_type" : "type-158",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-157", "type-150" ],
+   "template_args" : [ "type-159", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-421",
-   "self_type" : "type-421",
+   "referenced_type" : "type-418",
+   "self_type" : "type-418",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-422", "type-150" ],
+   "template_args" : [ "type-419", "type-153" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28209,7 +28275,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-141"
     },
     {
      "access" : "private",
@@ -28220,8 +28286,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-138",
-   "self_type" : "type-138",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28233,13 +28299,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-140"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28269,7 +28335,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28299,7 +28365,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28324,13 +28390,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-135"
+     "referenced_type" : "type-137"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28341,11 +28407,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-134",
-   "self_type" : "type-134",
+   "referenced_type" : "type-136",
+   "self_type" : "type-136",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-138" ],
+   "template_args" : [ "type-140" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28355,13 +28421,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28372,11 +28438,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-130",
+   "self_type" : "type-130",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28409,23 +28475,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-163"
+     "referenced_type" : "type-166"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-162",
-   "self_type" : "type-162",
+   "referenced_type" : "type-165",
+   "self_type" : "type-165",
    "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"
@@ -28436,13 +28502,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-170",
-   "self_type" : "type-170",
+   "referenced_type" : "type-173",
+   "self_type" : "type-173",
    "size" : 24,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28551,13 +28617,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-170"
+     "referenced_type" : "type-173"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-297",
-   "self_type" : "type-297",
+   "referenced_type" : "type-294",
+   "self_type" : "type-294",
    "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",
@@ -28671,12 +28737,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-143"
     },
     {
      "field_name" : "value",
      "field_offset" : 64,
-     "referenced_type" : "type-677"
+     "referenced_type" : "type-681"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28685,7 +28751,7 @@
    "self_type" : "type-694",
    "size" : 72,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141", "type-677" ],
+   "template_args" : [ "type-143", "type-681" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28715,17 +28781,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-681"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-680",
-   "self_type" : "type-680",
+   "referenced_type" : "type-679",
+   "self_type" : "type-679",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-524" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28735,17 +28801,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-371" ],
+   "template_args" : [ "type-368" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28755,17 +28821,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-291",
-   "self_type" : "type-291",
+   "referenced_type" : "type-288",
+   "self_type" : "type-288",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-244" ],
+   "template_args" : [ "type-246" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28775,17 +28841,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-197"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-250",
-   "self_type" : "type-250",
+   "referenced_type" : "type-252",
+   "self_type" : "type-252",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-195" ],
+   "template_args" : [ "type-198" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28795,17 +28861,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-283" ],
+   "template_args" : [ "type-279" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28815,17 +28881,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-358"
+     "referenced_type" : "type-355"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-357",
-   "self_type" : "type-357",
+   "referenced_type" : "type-354",
+   "self_type" : "type-354",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-360" ],
+   "template_args" : [ "type-357" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28835,17 +28901,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-486"
+     "referenced_type" : "type-483"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-485",
-   "self_type" : "type-485",
+   "referenced_type" : "type-482",
+   "self_type" : "type-482",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-488" ],
+   "template_args" : [ "type-485" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28855,17 +28921,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-337" ],
+   "template_args" : [ "type-334" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28875,17 +28941,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-54"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-56" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28895,17 +28961,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-499"
+     "referenced_type" : "type-497"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-498",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-496",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-501" ],
+   "template_args" : [ "type-499" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28935,17 +29001,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-366"
+     "referenced_type" : "type-363"
     }
    ],
    "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-365",
-   "self_type" : "type-365",
+   "referenced_type" : "type-362",
+   "self_type" : "type-362",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-170" ],
+   "template_args" : [ "type-173" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28955,36 +29021,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-374"
+     "referenced_type" : "type-371"
     }
    ],
    "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-373",
-   "self_type" : "type-373",
+   "referenced_type" : "type-370",
+   "self_type" : "type-370",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-297" ],
+   "template_args" : [ "type-294" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2402",
-   "self_type" : "type-2402",
+   "referenced_type" : "type-2404",
+   "self_type" : "type-2404",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28994,8 +29060,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29005,22 +29071,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long>",
    "name" : "android::trait_pointer<long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIlEE"
   },
   {
@@ -29031,7 +29097,7 @@
    "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29060,8 +29126,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29071,8 +29137,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-486",
+   "self_type" : "type-486",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29082,11 +29148,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29097,26 +29163,26 @@
    "self_type" : "type-812",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-798",
-   "self_type" : "type-798",
+   "referenced_type" : "type-790",
+   "self_type" : "type-790",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-758",
-   "self_type" : "type-758",
+   "referenced_type" : "type-756",
+   "self_type" : "type-756",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29126,11 +29192,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-651",
-   "self_type" : "type-651",
+   "referenced_type" : "type-649",
+   "self_type" : "type-649",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29141,18 +29207,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
@@ -29170,22 +29236,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-579",
-   "self_type" : "type-579",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29196,18 +29262,18 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "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-724",
-   "self_type" : "type-724",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyImEE"
   },
   {
@@ -29225,11 +29291,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29240,7 +29306,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29280,8 +29346,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29291,11 +29357,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-505",
+   "self_type" : "type-505",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29306,18 +29372,18 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-784",
-   "self_type" : "type-784",
+   "referenced_type" : "type-778",
+   "self_type" : "type-778",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29335,33 +29401,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-641",
-   "self_type" : "type-641",
+   "referenced_type" : "type-640",
+   "self_type" : "type-640",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-731",
-   "self_type" : "type-731",
+   "referenced_type" : "type-729",
+   "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-692",
-   "self_type" : "type-692",
+   "referenced_type" : "type-688",
+   "self_type" : "type-688",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29379,52 +29445,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-533",
+   "self_type" : "type-533",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-669",
-   "self_type" : "type-669",
+   "referenced_type" : "type-665",
+   "self_type" : "type-665",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-747",
-   "self_type" : "type-747",
+   "referenced_type" : "type-746",
+   "self_type" : "type-746",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "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-711",
-   "self_type" : "type-711",
+   "referenced_type" : "type-710",
+   "self_type" : "type-710",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-626",
-   "self_type" : "type-626",
+   "referenced_type" : "type-622",
+   "self_type" : "type-622",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29434,11 +29500,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-457",
+   "self_type" : "type-457",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29449,7 +29515,7 @@
    "self_type" : "type-810",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29489,8 +29555,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29500,11 +29566,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-513",
-   "self_type" : "type-513",
+   "referenced_type" : "type-510",
+   "self_type" : "type-510",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29515,7 +29581,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29526,7 +29592,7 @@
    "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29544,41 +29610,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<int>",
    "name" : "android::trait_trivial_dtor<int>",
-   "referenced_type" : "type-648",
-   "self_type" : "type-648",
+   "referenced_type" : "type-646",
+   "self_type" : "type-646",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-739",
-   "self_type" : "type-739",
+   "referenced_type" : "type-737",
+   "self_type" : "type-737",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<long>",
    "name" : "android::trait_trivial_dtor<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<short>",
    "name" : "android::trait_trivial_dtor<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-615",
+   "self_type" : "type-615",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-603" ],
@@ -29588,52 +29654,52 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-537",
+   "self_type" : "type-537",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
+   "referenced_type" : "type-672",
+   "self_type" : "type-672",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-750",
-   "self_type" : "type-750",
+   "referenced_type" : "type-748",
+   "self_type" : "type-748",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29643,22 +29709,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-477",
-   "self_type" : "type-477",
+   "referenced_type" : "type-474",
+   "self_type" : "type-474",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29687,11 +29753,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-190",
-   "self_type" : "type-190",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-178" ],
+   "template_args" : [ "type-180" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29702,15 +29768,15 @@
    "self_type" : "type-903",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29720,8 +29786,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-502",
-   "self_type" : "type-502",
+   "referenced_type" : "type-495",
+   "self_type" : "type-495",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29731,22 +29797,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-535",
-   "self_type" : "type-535",
+   "referenced_type" : "type-532",
+   "self_type" : "type-532",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-290" ],
+   "template_args" : [ "type-287" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29757,7 +29823,7 @@
    "self_type" : "type-799",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-45" ],
+   "template_args" : [ "type-44" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29775,11 +29841,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-662",
-   "self_type" : "type-662",
+   "referenced_type" : "type-656",
+   "self_type" : "type-656",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29790,7 +29856,7 @@
    "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-732" ],
+   "template_args" : [ "type-730" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
@@ -29801,15 +29867,15 @@
    "self_type" : "type-709",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<short>",
    "name" : "android::trait_trivial_move<short>",
-   "referenced_type" : "type-621",
-   "self_type" : "type-621",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-603" ],
@@ -29823,18 +29889,18 @@
    "self_type" : "type-600",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-207" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29845,18 +29911,18 @@
    "self_type" : "type-753",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-209" ],
+   "template_args" : [ "type-222" ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveImEE"
   },
   {
@@ -29874,11 +29940,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-150" ],
+   "template_args" : [ "type-153" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
@@ -29889,15 +29955,15 @@
    "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-677" ],
+   "template_args" : [ "type-681" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2403",
+   "referenced_type" : "type-2405",
+   "self_type" : "type-2405",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29907,8 +29973,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-821",
-   "self_type" : "type-821",
+   "referenced_type" : "type-822",
+   "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29918,22 +29984,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<const native_handle *>",
    "name" : "android::traits<const native_handle *>",
-   "referenced_type" : "type-822",
-   "self_type" : "type-822",
+   "referenced_type" : "type-823",
+   "self_type" : "type-823",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-141" ],
+   "template_args" : [ "type-143" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long>",
    "name" : "android::traits<long>",
-   "referenced_type" : "type-1432",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-1436",
+   "self_type" : "type-1436",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIlEE"
   },
   {
@@ -29942,12 +30008,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29965,20 +30031,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29995,8 +30061,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2436",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2438",
+   "self_type" : "type-2438",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -30006,13 +30072,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2381",
-   "self_type" : "type-2381",
+   "referenced_type" : "type-2383",
+   "self_type" : "type-2383",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30023,13 +30089,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30040,16 +30106,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long>",
    "name" : "android::use_trivial_move<long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-286" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIlEE"
   },
   {
@@ -30080,12 +30146,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     },
     {
      "field_name" : "xyzc_points",
@@ -30112,7 +30178,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30134,7 +30200,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30144,32 +30210,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30186,33 +30252,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-521"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 320,
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-519"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 384,
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-519"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-520",
-   "self_type" : "type-520",
+   "referenced_type" : "type-517",
+   "self_type" : "type-517",
    "size" : 56,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30223,28 +30289,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30319,43 +30385,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "cb",
      "field_offset" : 64,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "cr",
      "field_offset" : 128,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 192,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 320,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-350",
-   "self_type" : "type-350",
+   "referenced_type" : "type-347",
+   "self_type" : "type-347",
    "size" : 80,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30366,108 +30432,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "flags",
      "field_offset" : 960,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "width",
      "field_offset" : 992,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "height",
      "field_offset" : 1024,
-     "referenced_type" : "type-237"
+     "referenced_type" : "type-239"
     },
     {
      "field_name" : "stride",
      "field_offset" : 1056,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "format",
      "field_offset" : 1088,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 1120,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 1152,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "fps",
      "field_offset" : 1184,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 1216,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 1248,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 1280,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 1312,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1536,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1600,
-     "referenced_type" : "type-569"
+     "referenced_type" : "type-566"
     },
     {
      "field_name" : "post",
      "field_offset" : 1664,
-     "referenced_type" : "type-571"
+     "referenced_type" : "type-568"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1728,
-     "referenced_type" : "type-573"
+     "referenced_type" : "type-570"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1792,
-     "referenced_type" : "type-575"
+     "referenced_type" : "type-572"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1856,
-     "referenced_type" : "type-566"
+     "referenced_type" : "type-563"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1920,
-     "referenced_type" : "type-578"
+     "referenced_type" : "type-575"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 288,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30478,63 +30544,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1984,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 2048,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "lock",
      "field_offset" : 2112,
-     "referenced_type" : "type-586"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 2176,
-     "referenced_type" : "type-582"
+     "referenced_type" : "type-579"
     },
     {
      "field_name" : "perform",
      "field_offset" : 2240,
-     "referenced_type" : "type-588"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 2304,
-     "referenced_type" : "type-590"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 2368,
-     "referenced_type" : "type-592"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 2432,
-     "referenced_type" : "type-594"
+     "referenced_type" : "type-591"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 2496,
-     "referenced_type" : "type-597"
+     "referenced_type" : "type-594"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 2560,
+     "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "validateBufferSize",
+     "field_offset" : 2624,
+     "referenced_type" : "type-598"
     },
     {
      "field_name" : "reserved_proc",
-     "field_offset" : 2560,
-     "referenced_type" : "type-599"
+     "field_offset" : 2688,
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-581",
-   "self_type" : "type-581",
+   "referenced_type" : "type-578",
+   "self_type" : "type-578",
    "size" : 344,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30545,33 +30621,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 128,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     },
     {
      "field_name" : "close",
      "field_offset" : 896,
-     "referenced_type" : "type-561"
+     "referenced_type" : "type-558"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-548",
-   "self_type" : "type-548",
+   "referenced_type" : "type-545",
+   "self_type" : "type-545",
    "size" : 120,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30582,13 +30658,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-553"
+     "referenced_type" : "type-550"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-552",
-   "self_type" : "type-552",
+   "referenced_type" : "type-549",
+   "self_type" : "type-549",
    "size" : 8,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30599,7 +30675,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30614,38 +30690,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "name",
      "field_offset" : 128,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "author",
      "field_offset" : 192,
-     "referenced_type" : "type-288"
+     "referenced_type" : "type-285"
     },
     {
      "field_name" : "methods",
      "field_offset" : 256,
-     "referenced_type" : "type-551"
+     "referenced_type" : "type-548"
     },
     {
      "field_name" : "dso",
      "field_offset" : 320,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-230"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 384,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-550",
-   "self_type" : "type-550",
+   "referenced_type" : "type-547",
+   "self_type" : "type-547",
    "size" : 248,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30711,12 +30787,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30743,22 +30819,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30790,27 +30866,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30842,27 +30918,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30894,32 +30970,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30941,28 +31017,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-144"
+     "referenced_type" : "type-146"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-143",
-   "self_type" : "type-143",
+   "referenced_type" : "type-145",
+   "self_type" : "type-145",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30972,13 +31048,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-436"
+     "referenced_type" : "type-433"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-435",
-   "self_type" : "type-435",
+   "referenced_type" : "type-432",
+   "self_type" : "type-432",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30989,8 +31065,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-580",
-   "self_type" : "type-580",
+   "referenced_type" : "type-577",
+   "self_type" : "type-577",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -31003,8 +31079,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31012,7 +31088,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::HdrCapabilities &&",
    "name" : "android::HdrCapabilities &&",
-   "referenced_type" : "type-960",
+   "referenced_type" : "type-962",
    "self_type" : "type-971",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
@@ -31030,8 +31106,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31039,8 +31115,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-394",
-   "self_type" : "type-400",
+   "referenced_type" : "type-393",
+   "self_type" : "type-397",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31048,8 +31124,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31066,7 +31142,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1311",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31075,7 +31151,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1316",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31084,7 +31160,7 @@
    "alignment" : 8,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-138",
+   "referenced_type" : "type-140",
    "self_type" : "type-1087",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31103,7 +31179,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1358",
-   "self_type" : "type-1411",
+   "self_type" : "type-1415",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31111,8 +31187,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-357",
-   "self_type" : "type-380",
+   "referenced_type" : "type-354",
+   "self_type" : "type-377",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31120,8 +31196,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-485",
-   "self_type" : "type-492",
+   "referenced_type" : "type-482",
+   "self_type" : "type-489",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31129,8 +31205,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-334",
-   "self_type" : "type-388",
+   "referenced_type" : "type-331",
+   "self_type" : "type-385",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31138,8 +31214,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-53",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31147,8 +31223,8 @@
    "alignment" : 8,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-498",
-   "self_type" : "type-505",
+   "referenced_type" : "type-496",
+   "self_type" : "type-502",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31156,7 +31232,7 @@
    "alignment" : 8,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"
diff --git a/29/64/x86_x86_64/source-based/libui.so.lsdump b/29/64/x86_x86_64/source-based/libui.so.lsdump
index ba6360c..8848d82 100644
--- a/29/64/x86_x86_64/source-based/libui.so.lsdump
+++ b/29/64/x86_x86_64/source-based/libui.so.lsdump
@@ -5,8 +5,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer_Plane [4]",
    "name" : "AHardwareBuffer_Plane [4]",
-   "referenced_type" : "type-509",
-   "self_type" : "type-508",
+   "referenced_type" : "type-506",
+   "self_type" : "type-505",
    "size" : 48,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h"
   },
@@ -14,7 +14,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> [3]",
    "name" : "android::details::TVec3<float> [3]",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-904",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -23,8 +23,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> [4]",
    "name" : "android::details::TVec4<float> [4]",
-   "referenced_type" : "type-200",
-   "self_type" : "type-2428",
+   "referenced_type" : "type-192",
+   "self_type" : "type-2430",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -32,7 +32,7 @@
    "alignment" : 1,
    "linker_set_key" : "char [0]",
    "name" : "char [0]",
-   "referenced_type" : "type-288",
+   "referenced_type" : "type-285",
    "self_type" : "type-1261",
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -47,16 +47,16 @@
    "alignment" : 4,
    "linker_set_key" : "int [0]",
    "name" : "int [0]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-145",
+   "referenced_type" : "type-105",
+   "self_type" : "type-148",
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "int [7]",
    "name" : "int [7]",
-   "referenced_type" : "type-103",
-   "self_type" : "type-564",
+   "referenced_type" : "type-105",
+   "self_type" : "type-561",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -64,7 +64,7 @@
    "alignment" : 1,
    "linker_set_key" : "unsigned char [5121]",
    "name" : "unsigned char [5121]",
-   "referenced_type" : "type-218",
+   "referenced_type" : "type-220",
    "self_type" : "type-1270",
    "size" : 5121,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
@@ -73,7 +73,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [10]",
    "name" : "unsigned int [10]",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1109",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -82,8 +82,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [12]",
    "name" : "unsigned int [12]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-559",
+   "referenced_type" : "type-125",
+   "self_type" : "type-556",
    "size" : 48,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -91,8 +91,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [25]",
    "name" : "unsigned int [25]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-558",
+   "referenced_type" : "type-125",
+   "self_type" : "type-555",
    "size" : 100,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -100,8 +100,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [3]",
    "name" : "unsigned int [3]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-941",
+   "referenced_type" : "type-125",
+   "self_type" : "type-935",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -109,8 +109,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int [8]",
    "name" : "unsigned int [8]",
-   "referenced_type" : "type-123",
-   "self_type" : "type-349",
+   "referenced_type" : "type-125",
+   "self_type" : "type-346",
    "size" : 32,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -118,26 +118,17 @@
    "alignment" : 4,
    "linker_set_key" : "void *[1]",
    "name" : "void *[1]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-523",
+   "referenced_type" : "type-229",
+   "self_type" : "type-521",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "void *[3]",
-   "name" : "void *[3]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-596",
-   "size" : 12,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
    "linker_set_key" : "void *[4]",
    "name" : "void *[4]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-519",
+   "referenced_type" : "type-229",
+   "self_type" : "type-517",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -145,8 +136,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *[6]",
    "name" : "void *[6]",
-   "referenced_type" : "type-227",
-   "self_type" : "type-524",
+   "referenced_type" : "type-229",
+   "self_type" : "type-522",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -154,7 +145,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *[7]",
    "name" : "void *[7]",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-609",
    "size" : 28,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
@@ -177,8 +168,8 @@
    "is_integral" : true,
    "linker_set_key" : "char",
    "name" : "char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-288",
+   "referenced_type" : "type-285",
+   "self_type" : "type-285",
    "size" : 1
   },
   {
@@ -187,16 +178,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "char16_t",
    "name" : "char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-182",
+   "referenced_type" : "type-185",
+   "self_type" : "type-185",
    "size" : 2
   },
   {
    "alignment" : 4,
    "linker_set_key" : "double",
    "name" : "double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "type-43",
+   "self_type" : "type-43",
    "size" : 8
   },
   {
@@ -212,8 +203,8 @@
    "is_integral" : true,
    "linker_set_key" : "int",
    "name" : "int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-103",
+   "referenced_type" : "type-105",
+   "self_type" : "type-105",
    "size" : 4
   },
   {
@@ -221,16 +212,16 @@
    "is_integral" : true,
    "linker_set_key" : "long",
    "name" : "long",
-   "referenced_type" : "type-687",
-   "self_type" : "type-687",
+   "referenced_type" : "type-684",
+   "self_type" : "type-684",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "long double",
    "name" : "long double",
-   "referenced_type" : "type-298",
-   "self_type" : "type-298",
+   "referenced_type" : "type-295",
+   "self_type" : "type-295",
    "size" : 8
   },
   {
@@ -238,8 +229,8 @@
    "is_integral" : true,
    "linker_set_key" : "long long",
    "name" : "long long",
-   "referenced_type" : "type-284",
-   "self_type" : "type-284",
+   "referenced_type" : "type-12",
+   "self_type" : "type-12",
    "size" : 8
   },
   {
@@ -266,8 +257,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned char",
    "name" : "unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-218",
+   "referenced_type" : "type-220",
+   "self_type" : "type-220",
    "size" : 1
   },
   {
@@ -276,8 +267,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned int",
    "name" : "unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-123",
+   "referenced_type" : "type-125",
+   "self_type" : "type-125",
    "size" : 4
   },
   {
@@ -296,8 +287,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "unsigned long long",
    "name" : "unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-124",
+   "referenced_type" : "type-126",
+   "self_type" : "type-126",
    "size" : 8
   },
   {
@@ -313,8 +304,8 @@
   {
    "linker_set_key" : "void",
    "name" : "void",
-   "referenced_type" : "type-151",
-   "self_type" : "type-151"
+   "referenced_type" : "type-154",
+   "self_type" : "type-154"
   }
  ],
  "elf_functions" :
@@ -1805,11 +1796,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_Format",
    "name" : "AHardwareBuffer_Format",
-   "referenced_type" : "type-616",
-   "self_type" : "type-616",
+   "referenced_type" : "type-617",
+   "self_type" : "type-617",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "AHardwareBuffer_Format"
   },
   {
@@ -1971,11 +1962,11 @@
    ],
    "linker_set_key" : "AHardwareBuffer_UsageFlags",
    "name" : "AHardwareBuffer_UsageFlags",
-   "referenced_type" : "type-678",
-   "self_type" : "type-678",
+   "referenced_type" : "type-676",
+   "self_type" : "type-676",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "AHardwareBuffer_UsageFlags"
   },
   {
@@ -1993,11 +1984,11 @@
    ],
    "linker_set_key" : "android::Condition::WakeUpType",
    "name" : "android::Condition::WakeUpType",
-   "referenced_type" : "type-260",
-   "self_type" : "type-260",
+   "referenced_type" : "type-256",
+   "self_type" : "type-256",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android9Condition10WakeUpTypeE"
   },
   {
@@ -2023,7 +2014,7 @@
    "self_type" : "type-1346",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android5Fence6StatusE"
   },
   {
@@ -2045,11 +2036,11 @@
    ],
    "linker_set_key" : "android::FenceTime::Snapshot::State",
    "name" : "android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1384",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1388",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime8Snapshot5StateE"
   },
   {
@@ -2072,11 +2063,11 @@
    ],
    "linker_set_key" : "android::FenceTime::State",
    "name" : "android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1378",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1383",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android9FenceTime5StateE"
   },
   {
@@ -2102,11 +2093,11 @@
    ],
    "linker_set_key" : "android::GraphicBuffer::HandleWrapMethod",
    "name" : "android::GraphicBuffer::HandleWrapMethod",
-   "referenced_type" : "type-629",
-   "self_type" : "type-629",
+   "referenced_type" : "type-630",
+   "self_type" : "type-630",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
-   "underlying_type" : "type-218",
+   "underlying_type" : "type-220",
    "unique_id" : "_ZTSN7android13GraphicBuffer16HandleWrapMethodE"
   },
   {
@@ -2124,11 +2115,11 @@
    ],
    "linker_set_key" : "android::GraphicBufferMapper::Version",
    "name" : "android::GraphicBufferMapper::Version",
-   "referenced_type" : "type-529",
-   "self_type" : "type-529",
+   "referenced_type" : "type-527",
+   "self_type" : "type-527",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android19GraphicBufferMapper7VersionE"
   },
   {
@@ -2142,11 +2133,11 @@
    ],
    "linker_set_key" : "android::String16::StaticLinkage",
    "name" : "android::String16::StaticLinkage",
-   "referenced_type" : "type-183",
-   "self_type" : "type-183",
+   "referenced_type" : "type-186",
+   "self_type" : "type-186",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8String1613StaticLinkageE"
   },
   {
@@ -2160,11 +2151,11 @@
    ],
    "linker_set_key" : "android::String8::StaticLinkage",
    "name" : "android::String8::StaticLinkage",
-   "referenced_type" : "type-864",
-   "self_type" : "type-864",
+   "referenced_type" : "type-862",
+   "self_type" : "type-862",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7String813StaticLinkageE"
   },
   {
@@ -2182,7 +2173,7 @@
    "self_type" : "type-975",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat33IfE7no_initE"
   },
   {
@@ -2196,11 +2187,11 @@
    ],
    "linker_set_key" : "android::details::TMat44<float>::no_init",
    "name" : "android::details::TMat44<float>::no_init",
-   "referenced_type" : "type-2429",
-   "self_type" : "type-2429",
+   "referenced_type" : "type-2431",
+   "self_type" : "type-2431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details6TMat44IfE7no_initE"
   },
   {
@@ -2214,11 +2205,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<double>::no_init",
    "name" : "android::details::TQuaternion<double>::no_init",
-   "referenced_type" : "type-389",
-   "self_type" : "type-389",
+   "referenced_type" : "type-386",
+   "self_type" : "type-386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdE7no_initE"
   },
   {
@@ -2232,11 +2223,11 @@
    ],
    "linker_set_key" : "android::details::TQuaternion<float>::no_init",
    "name" : "android::details::TQuaternion<float>::no_init",
-   "referenced_type" : "type-428",
-   "self_type" : "type-428",
+   "referenced_type" : "type-425",
+   "self_type" : "type-425",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfE7no_initE"
   },
   {
@@ -2254,7 +2245,7 @@
    "self_type" : "type-1255",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IbE7no_initE"
   },
   {
@@ -2272,7 +2263,7 @@
    "self_type" : "type-1068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IdE7no_initE"
   },
   {
@@ -2290,7 +2281,7 @@
    "self_type" : "type-1135",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec2IfE7no_initE"
   },
   {
@@ -2308,7 +2299,7 @@
    "self_type" : "type-1365",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IdE7no_initE"
   },
   {
@@ -2322,11 +2313,11 @@
    ],
    "linker_set_key" : "android::details::TVec3<float>::no_init",
    "name" : "android::details::TVec3<float>::no_init",
-   "referenced_type" : "type-1412",
-   "self_type" : "type-1412",
+   "referenced_type" : "type-1414",
+   "self_type" : "type-1414",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec3IfE7no_initE"
   },
   {
@@ -2340,11 +2331,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<double>::no_init",
    "name" : "android::details::TVec4<double>::no_init",
-   "referenced_type" : "type-148",
-   "self_type" : "type-148",
+   "referenced_type" : "type-137",
+   "self_type" : "type-137",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IdE7no_initE"
   },
   {
@@ -2358,11 +2349,11 @@
    ],
    "linker_set_key" : "android::details::TVec4<float>::no_init",
    "name" : "android::details::TVec4<float>::no_init",
-   "referenced_type" : "type-309",
-   "self_type" : "type-309",
+   "referenced_type" : "type-304",
+   "self_type" : "type-304",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android7details5TVec4IfE7no_initE"
   },
   {
@@ -2377,11 +2368,11 @@
    ],
    "linker_set_key" : "android::half::Binary",
    "name" : "android::half::Binary",
-   "referenced_type" : "type-403",
-   "self_type" : "type-403",
+   "referenced_type" : "type-399",
+   "self_type" : "type-399",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android4half6BinaryE"
   },
   {
@@ -2407,7 +2398,7 @@
    "self_type" : "type-1321",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware21HidlReturnRestrictionE"
   },
   {
@@ -2429,7 +2420,7 @@
    "self_type" : "type-1129",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/MQDescriptor.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware8MQFlavorE"
   },
   {
@@ -2451,11 +2442,11 @@
    ],
    "linker_set_key" : "android::hardware::ProcessState::CallRestriction",
    "name" : "android::hardware::ProcessState::CallRestriction",
-   "referenced_type" : "type-276",
-   "self_type" : "type-276",
+   "referenced_type" : "type-272",
+   "self_type" : "type-272",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware12ProcessState15CallRestrictionE"
   },
   {
@@ -2509,7 +2500,7 @@
    "self_type" : "type-1308",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware6Status9ExceptionE"
   },
   {
@@ -2563,7 +2554,7 @@
    "self_type" : "type-1223",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android8hardware7details16HidlInstrumentor20InstrumentationEventE"
   },
   {
@@ -2665,11 +2656,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-150",
+   "referenced_type" : "type-153",
+   "self_type" : "type-153",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011BufferUsageE"
   },
   {
@@ -2723,7 +2714,7 @@
    "self_type" : "type-1140",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09ColorModeE"
   },
   {
@@ -2765,7 +2756,7 @@
    "self_type" : "type-1141",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_014ColorTransformE"
   },
   {
@@ -3007,7 +2998,7 @@
    "self_type" : "type-1139",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09DataspaceE"
   },
   {
@@ -3033,7 +3024,7 @@
    "self_type" : "type-1143",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_03HdrE"
   },
   {
@@ -3127,7 +3118,7 @@
    "self_type" : "type-1137",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_011PixelFormatE"
   },
   {
@@ -3161,7 +3152,7 @@
    "self_type" : "type-1138",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_09TransformE"
   },
   {
@@ -3271,11 +3262,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-158",
+   "referenced_type" : "type-160",
+   "self_type" : "type-160",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111BufferUsageE"
   },
   {
@@ -3341,7 +3332,7 @@
    "self_type" : "type-1170",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19ColorModeE"
   },
   {
@@ -3599,7 +3590,7 @@
    "self_type" : "type-1169",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_19DataspaceE"
   },
   {
@@ -3721,7 +3712,7 @@
    "self_type" : "type-1168",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_111PixelFormatE"
   },
   {
@@ -3751,7 +3742,7 @@
    "self_type" : "type-1171",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_112RenderIntentE"
   },
   {
@@ -3865,11 +3856,11 @@
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-420",
+   "referenced_type" : "type-417",
+   "self_type" : "type-417",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-124",
+   "underlying_type" : "type-126",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211BufferUsageE"
   },
   {
@@ -3939,7 +3930,7 @@
    "self_type" : "type-1192",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29ColorModeE"
   },
   {
@@ -4213,7 +4204,7 @@
    "self_type" : "type-1191",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_29DataspaceE"
   },
   {
@@ -4243,7 +4234,7 @@
    "self_type" : "type-1190",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_23HdrE"
   },
   {
@@ -4369,7 +4360,7 @@
    "self_type" : "type-1194",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h",
-   "underlying_type" : "type-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android8hardware8graphics6common4V1_211PixelFormatE"
   },
   {
@@ -4391,11 +4382,11 @@
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo::Architecture",
    "name" : "android::hidl::base::V1_0::DebugInfo::Architecture",
-   "referenced_type" : "type-164",
-   "self_type" : "type-164",
+   "referenced_type" : "type-167",
+   "self_type" : "type-167",
    "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-103",
+   "underlying_type" : "type-105",
    "unique_id" : "_ZTSN7android4hidl4base4V1_09DebugInfo12ArchitectureE"
   },
   {
@@ -4433,11 +4424,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::orientation_flags",
    "name" : "android::ui::Transform::orientation_flags",
-   "referenced_type" : "type-2439",
-   "self_type" : "type-2439",
+   "referenced_type" : "type-2441",
+   "self_type" : "type-2441",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform17orientation_flagsE"
   },
   {
@@ -4467,11 +4458,11 @@
    ],
    "linker_set_key" : "android::ui::Transform::type_mask",
    "name" : "android::ui::Transform::type_mask",
-   "referenced_type" : "type-2440",
-   "self_type" : "type-2440",
+   "referenced_type" : "type-2442",
+   "self_type" : "type-2442",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTSN7android2ui9Transform9type_maskE"
   },
   {
@@ -4521,7 +4512,7 @@
    "self_type" : "type-1257",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_LogPriority"
   },
   {
@@ -4575,7 +4566,7 @@
    "self_type" : "type-1212",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_t"
   },
   {
@@ -4601,7 +4592,7 @@
    "self_type" : "type-1217",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_mode_v1_1_t"
   },
   {
@@ -4643,7 +4634,7 @@
    "self_type" : "type-1213",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_color_transform_t"
   },
   {
@@ -4885,7 +4876,7 @@
    "self_type" : "type-1211",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_t"
   },
   {
@@ -4915,7 +4906,7 @@
    "self_type" : "type-1216",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_1_t"
   },
   {
@@ -4945,7 +4936,7 @@
    "self_type" : "type-1221",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_dataspace_v1_2_t"
   },
   {
@@ -4987,7 +4978,7 @@
    "self_type" : "type-1225",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_component"
   },
   {
@@ -5025,7 +5016,7 @@
    "self_type" : "type-1227",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_flex_format"
   },
   {
@@ -5051,7 +5042,7 @@
    "self_type" : "type-1214",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_t"
   },
   {
@@ -5069,7 +5060,7 @@
    "self_type" : "type-1220",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_hdr_v1_2_t"
   },
   {
@@ -5099,7 +5090,7 @@
    "self_type" : "type-1224",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-sw.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "_ZTS25android_pixel_format_sw_t"
   },
   {
@@ -5193,7 +5184,7 @@
    "self_type" : "type-1209",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_t"
   },
   {
@@ -5235,7 +5226,7 @@
    "self_type" : "type-1215",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_1_t"
   },
   {
@@ -5253,7 +5244,7 @@
    "self_type" : "type-1222",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.2.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_pixel_format_v1_2_t"
   },
   {
@@ -5283,7 +5274,7 @@
    "self_type" : "type-1219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.1.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_render_intent_v1_1_t"
   },
   {
@@ -5317,7 +5308,7 @@
    "self_type" : "type-1210",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics-base-v1.0.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "android_transform_t"
   },
   {
@@ -5371,7 +5362,7 @@
    "self_type" : "type-1258",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/android/log.h",
-   "underlying_type" : "type-123",
+   "underlying_type" : "type-125",
    "unique_id" : "log_id"
   }
  ],
@@ -5384,18 +5375,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-187"
+     "referenced_type" : "type-189"
     },
     {
-     "referenced_type" : "type-272"
+     "referenced_type" : "type-268"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-271",
+   "referenced_type" : "type-267",
    "return_type" : "type-6",
-   "self_type" : "type-271",
+   "self_type" : "type-267",
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
   {
@@ -5408,11 +5399,11 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
    "referenced_type" : "type-606",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-606",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5426,26 +5417,26 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
    "referenced_type" : "type-603",
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "self_type" : "type-603",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5456,15 +5447,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-580",
-   "return_type" : "type-103",
-   "self_type" : "type-580",
+   "referenced_type" : "type-578",
+   "return_type" : "type-105",
+   "self_type" : "type-578",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5474,18 +5465,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "referenced_type" : "type-592",
-   "return_type" : "type-103",
-   "self_type" : "type-592",
+   "referenced_type" : "type-590",
+   "return_type" : "type-105",
+   "self_type" : "type-590",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5495,33 +5486,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "referenced_type" : "type-588",
-   "return_type" : "type-103",
-   "self_type" : "type-588",
+   "referenced_type" : "type-586",
+   "return_type" : "type-105",
+   "self_type" : "type-586",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5531,36 +5522,36 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-595",
-   "return_type" : "type-103",
-   "self_type" : "type-595",
+   "referenced_type" : "type-593",
+   "return_type" : "type-105",
+   "self_type" : "type-593",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5570,33 +5561,33 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     }
    ],
-   "referenced_type" : "type-584",
-   "return_type" : "type-103",
-   "self_type" : "type-584",
+   "referenced_type" : "type-582",
+   "return_type" : "type-105",
+   "self_type" : "type-582",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5606,36 +5597,93 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-590",
-   "return_type" : "type-103",
-   "self_type" : "type-590",
+   "referenced_type" : "type-588",
+   "return_type" : "type-105",
+   "self_type" : "type-588",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-124"
+    },
+    {
+     "referenced_type" : "type-124"
+    }
+   ],
+   "referenced_type" : "type-595",
+   "return_type" : "type-105",
+   "self_type" : "type-595",
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "type-579"
+    },
+    {
+     "referenced_type" : "type-145"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-105"
+    },
+    {
+     "referenced_type" : "type-125"
+    }
+   ],
+   "referenced_type" : "type-597",
+   "return_type" : "type-105",
+   "self_type" : "type-597",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5645,15 +5693,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-581"
+     "referenced_type" : "type-579"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-586",
-   "return_type" : "type-103",
-   "self_type" : "type-586",
+   "referenced_type" : "type-584",
+   "return_type" : "type-105",
+   "self_type" : "type-584",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
   {
@@ -5663,18 +5711,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-554"
+     "referenced_type" : "type-551"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
-     "referenced_type" : "type-556"
+     "referenced_type" : "type-553"
     }
    ],
-   "referenced_type" : "type-553",
-   "return_type" : "type-103",
-   "self_type" : "type-553",
+   "referenced_type" : "type-550",
+   "return_type" : "type-105",
+   "self_type" : "type-550",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5684,12 +5732,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     }
    ],
-   "referenced_type" : "type-573",
-   "return_type" : "type-103",
-   "self_type" : "type-573",
+   "referenced_type" : "type-570",
+   "return_type" : "type-105",
+   "self_type" : "type-570",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5699,15 +5747,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "referenced_type" : "type-571",
-   "return_type" : "type-103",
-   "self_type" : "type-571",
+   "referenced_type" : "type-568",
+   "return_type" : "type-105",
+   "self_type" : "type-568",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5717,15 +5765,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-566",
-   "return_type" : "type-103",
-   "self_type" : "type-566",
+   "referenced_type" : "type-563",
+   "return_type" : "type-105",
+   "self_type" : "type-563",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5735,24 +5783,24 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-569",
-   "return_type" : "type-103",
-   "self_type" : "type-569",
+   "referenced_type" : "type-566",
+   "return_type" : "type-105",
+   "self_type" : "type-566",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
   {
@@ -5762,12 +5810,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-557"
+     "referenced_type" : "type-554"
     }
    ],
-   "referenced_type" : "type-561",
-   "return_type" : "type-103",
-   "self_type" : "type-561",
+   "referenced_type" : "type-558",
+   "return_type" : "type-105",
+   "self_type" : "type-558",
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
   {
@@ -5777,12 +5825,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-249",
-   "return_type" : "type-103",
-   "self_type" : "type-249",
+   "referenced_type" : "type-251",
+   "return_type" : "type-105",
+   "self_type" : "type-251",
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
   {
@@ -5795,14 +5843,14 @@
      "referenced_type" : "type-604"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "referenced_type" : "type-608",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "self_type" : "type-608",
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -5813,27 +5861,27 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-222"
-    },
-    {
-     "referenced_type" : "type-223"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-224"
     },
     {
      "referenced_type" : "type-225"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-227"
+    },
+    {
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-229"
     }
    ],
-   "referenced_type" : "type-221",
-   "return_type" : "type-151",
-   "self_type" : "type-221",
+   "referenced_type" : "type-223",
+   "return_type" : "type-154",
+   "self_type" : "type-223",
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
   {
@@ -5843,12 +5891,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-522"
+     "referenced_type" : "type-520"
     }
    ],
-   "referenced_type" : "type-521",
-   "return_type" : "type-151",
-   "self_type" : "type-521",
+   "referenced_type" : "type-519",
+   "return_type" : "type-154",
+   "self_type" : "type-519",
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
   {
@@ -5858,18 +5906,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-567"
+     "referenced_type" : "type-564"
     },
     {
-     "referenced_type" : "type-576"
+     "referenced_type" : "type-573"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "referenced_type" : "type-575",
-   "return_type" : "type-151",
-   "self_type" : "type-575",
+   "referenced_type" : "type-572",
+   "return_type" : "type-154",
+   "self_type" : "type-572",
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   }
  ],
@@ -5884,7 +5932,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1433",
+   "return_type" : "type-1436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5896,7 +5944,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1434",
+   "return_type" : "type-1437",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5908,7 +5956,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1435",
+   "return_type" : "type-1438",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5920,7 +5968,7 @@
      "referenced_type" : "type-1192"
     }
    ],
-   "return_type" : "type-1436",
+   "return_type" : "type-1439",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5932,7 +5980,7 @@
      "referenced_type" : "type-1211"
     }
    ],
-   "return_type" : "type-1437",
+   "return_type" : "type-1440",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5941,10 +5989,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-1438",
+   "return_type" : "type-1441",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5956,7 +6004,7 @@
      "referenced_type" : "type-1171"
     }
    ],
-   "return_type" : "type-1439",
+   "return_type" : "type-1442",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5968,7 +6016,7 @@
      "referenced_type" : "type-1213"
     }
    ],
-   "return_type" : "type-1440",
+   "return_type" : "type-1443",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -5980,7 +6028,7 @@
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-1441",
+   "return_type" : "type-1444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/DebugUtils.h"
   },
   {
@@ -6067,7 +6115,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1042"
@@ -6076,7 +6124,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-1442",
+   "return_type" : "type-1445",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6086,10 +6134,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6098,14 +6146,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1443"
+     "referenced_type" : "type-1446"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6115,10 +6163,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6128,18 +6176,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1444"
+     "referenced_type" : "type-1447"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1445"
+     "referenced_type" : "type-1448"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1446"
+     "referenced_type" : "type-1449"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6149,10 +6197,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6165,10 +6213,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1447"
+     "referenced_type" : "type-1450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6178,23 +6226,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1448"
+     "referenced_type" : "type-1451"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6204,28 +6252,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1449"
+     "referenced_type" : "type-1452"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1450"
+     "referenced_type" : "type-1453"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1451"
+     "referenced_type" : "type-1454"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6235,23 +6283,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1452"
+     "referenced_type" : "type-1455"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6261,10 +6309,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6273,14 +6321,14 @@
      "referenced_type" : "type-1050"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1453"
+     "referenced_type" : "type-1456"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6290,10 +6338,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6303,18 +6351,18 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1454"
+     "referenced_type" : "type-1457"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1455"
+     "referenced_type" : "type-1458"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1456"
+     "referenced_type" : "type-1459"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6324,10 +6372,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
      "referenced_type" : "type-1036"
@@ -6340,10 +6388,10 @@
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1457"
+     "referenced_type" : "type-1460"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6353,23 +6401,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
-     "referenced_type" : "type-1033"
+     "referenced_type" : "type-1030"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1458"
+     "referenced_type" : "type-1461"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6379,28 +6427,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1459"
+     "referenced_type" : "type-1462"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1460"
+     "referenced_type" : "type-1463"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1461"
+     "referenced_type" : "type-1464"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6410,23 +6458,23 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1006"
+     "referenced_type" : "type-1000"
     },
     {
-     "referenced_type" : "type-1029"
+     "referenced_type" : "type-1021"
     },
     {
-     "referenced_type" : "type-934"
+     "referenced_type" : "type-926"
     },
     {
      "referenced_type" : "type-10"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1462"
+     "referenced_type" : "type-1465"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -6436,16 +6484,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1427"
+     "referenced_type" : "type-1431"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -6454,10 +6502,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
@@ -6467,10 +6515,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6480,13 +6528,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1400"
+     "referenced_type" : "type-1404"
     },
     {
-     "referenced_type" : "type-1401"
+     "referenced_type" : "type-1405"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -6496,25 +6544,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6525,10 +6573,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6538,13 +6586,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6555,28 +6603,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-1463"
+     "referenced_type" : "type-1466"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6587,34 +6635,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6624,19 +6672,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6646,22 +6694,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6671,16 +6719,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-1464"
+     "referenced_type" : "type-1467"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6690,22 +6738,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "return_type" : "type-6",
@@ -6718,10 +6766,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-621",
+   "return_type" : "type-622",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6730,10 +6778,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-621"
+     "referenced_type" : "type-622"
     }
    ],
-   "return_type" : "type-680",
+   "return_type" : "type-679",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6745,13 +6793,13 @@
      "referenced_type" : "type-628"
     }
    ],
-   "return_type" : "type-623",
+   "return_type" : "type-624",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
    "function_name" : "android::GraphicBuffer::dumpAllocationsToSystemLog",
    "linker_set_key" : "_ZN7android13GraphicBuffer26dumpAllocationsToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6763,7 +6811,7 @@
      "referenced_type" : "type-636"
     }
    ],
-   "return_type" : "type-679",
+   "return_type" : "type-678",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6773,24 +6821,24 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6800,27 +6848,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6830,10 +6878,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6843,27 +6891,27 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6873,30 +6921,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6906,33 +6954,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6942,16 +6990,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6961,19 +7009,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -6983,7 +7031,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
      "referenced_type" : "type-1251"
@@ -6998,7 +7046,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7008,34 +7056,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7045,26 +7093,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1465"
+     "referenced_type" : "type-1468"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7074,25 +7122,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7101,7 +7149,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7111,29 +7159,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1466"
+     "referenced_type" : "type-1469"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7143,10 +7191,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7156,34 +7204,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-629"
+     "referenced_type" : "type-630"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7193,26 +7241,26 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1467"
+     "referenced_type" : "type-1470"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7222,25 +7270,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1132"
@@ -7249,7 +7297,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7259,29 +7307,29 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-1468"
+     "referenced_type" : "type-1471"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7291,10 +7339,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7305,10 +7353,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7319,10 +7367,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7333,10 +7381,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -7345,16 +7393,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/PixelFormat.h"
   },
   {
    "function_name" : "android::Gralloc2Mapper::preload",
    "linker_set_key" : "_ZN7android14Gralloc2Mapper7preloadEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7364,10 +7412,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7377,10 +7425,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-343"
+     "referenced_type" : "type-340"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7396,10 +7444,10 @@
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7415,7 +7463,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7431,7 +7479,7 @@
      "referenced_type" : "type-970"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7444,7 +7492,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7457,7 +7505,7 @@
      "referenced_type" : "type-966"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -7483,13 +7531,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7499,13 +7547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-360"
+     "referenced_type" : "type-357"
     },
     {
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -7524,7 +7572,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7543,7 +7591,7 @@
      "referenced_type" : "type-1042"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
   {
@@ -7553,16 +7601,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7573,10 +7621,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7586,13 +7634,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1405"
+     "referenced_type" : "type-1409"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-1469",
+   "return_type" : "type-1472",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -7602,19 +7650,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
    "function_name" : "android::GraphicBufferMapper::preloadHal",
    "linker_set_key" : "_ZN7android19GraphicBufferMapper10preloadHalEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7624,28 +7672,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7655,16 +7703,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7674,34 +7722,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7711,25 +7759,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7739,19 +7787,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7761,30 +7809,30 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7794,13 +7842,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7810,33 +7858,33 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7846,36 +7894,36 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7885,22 +7933,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7911,10 +7959,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7925,10 +7973,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-539"
+     "referenced_type" : "type-537"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
   {
@@ -7937,16 +7985,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2448"
+     "referenced_type" : "type-2450"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
   {
    "function_name" : "android::GraphicBufferAllocator::dumpToSystemLog",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator15dumpToSystemLogEv",
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7956,13 +8004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -7972,93 +8020,93 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-343"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-124"
-    },
-    {
-     "referenced_type" : "type-1470"
+     "referenced_type" : "type-1473"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorC2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD1Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "function_name" : "android::GraphicBufferAllocator::~GraphicBufferAllocator",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocatorD2Ev",
    "parameters" :
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-545"
+     "referenced_type" : "type-542"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -8071,7 +8119,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8084,7 +8132,7 @@
      "referenced_type" : "type-1359"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
   {
@@ -8094,7 +8142,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8103,7 +8151,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8113,7 +8161,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
      "referenced_type" : "type-10"
@@ -8128,7 +8176,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8138,10 +8186,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-10"
@@ -8150,7 +8198,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8160,10 +8208,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8199,13 +8247,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8215,13 +8263,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8231,10 +8279,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8244,13 +8292,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8260,13 +8308,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8276,10 +8324,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8289,10 +8337,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8302,10 +8350,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8315,13 +8363,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2436"
+     "referenced_type" : "type-2438"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2442",
+   "return_type" : "type-2444",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -8334,7 +8382,7 @@
      "referenced_type" : "type-1296"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Rect.h"
   },
   {
@@ -8347,16 +8395,16 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8372,10 +8420,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8391,10 +8439,10 @@
      "referenced_type" : "type-1296"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1300",
@@ -8410,10 +8458,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8426,10 +8474,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8438,7 +8486,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "referenced_type" : "type-1361"
@@ -8456,7 +8504,7 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-889"
+     "referenced_type" : "type-879"
     },
     {
      "referenced_type" : "type-1361"
@@ -8490,7 +8538,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8506,7 +8554,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8519,10 +8567,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8538,7 +8586,7 @@
      "referenced_type" : "type-1341"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8551,10 +8599,10 @@
      "referenced_type" : "type-1358"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -8564,13 +8612,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8580,13 +8628,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8596,19 +8644,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8619,16 +8667,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8639,22 +8687,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8665,16 +8713,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8684,16 +8732,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8703,10 +8751,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8716,22 +8764,22 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8741,19 +8789,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8763,25 +8811,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8791,19 +8839,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8813,25 +8861,25 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8840,10 +8888,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8853,13 +8901,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8869,16 +8917,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8888,16 +8936,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8907,10 +8955,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8920,13 +8968,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8936,13 +8984,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8952,19 +9000,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8974,13 +9022,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -8990,13 +9038,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9006,19 +9054,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9028,13 +9076,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9044,13 +9092,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9060,19 +9108,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9082,10 +9130,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
@@ -9102,7 +9150,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-10"
@@ -9111,7 +9159,7 @@
      "referenced_type" : "type-10"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9121,19 +9169,19 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9143,16 +9191,16 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2393"
+     "referenced_type" : "type-2395"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9162,16 +9210,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9181,13 +9229,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9197,13 +9245,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9213,10 +9261,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9226,13 +9274,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9242,13 +9290,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9258,10 +9306,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9271,10 +9319,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9284,10 +9332,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9297,13 +9345,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2391"
+     "referenced_type" : "type-2393"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2393",
+   "return_type" : "type-2395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -9313,10 +9361,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9326,13 +9374,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9342,13 +9390,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1394"
+     "referenced_type" : "type-1398"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9358,7 +9406,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1251"
@@ -9373,7 +9421,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9383,13 +9431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9399,13 +9447,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9415,13 +9463,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9431,13 +9479,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1382"
+     "referenced_type" : "type-1386"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9447,13 +9495,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9463,13 +9511,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9480,7 +9528,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9489,7 +9537,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9499,13 +9547,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9515,13 +9563,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-1410"
+     "referenced_type" : "type-1415"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9531,13 +9579,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9548,7 +9596,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
      "referenced_type" : "type-1361"
@@ -9557,7 +9605,7 @@
      "referenced_type" : "type-6"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -9567,25 +9615,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1393"
+     "referenced_type" : "type-1397"
     },
     {
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferMapper>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE11getInstanceEv",
-   "return_type" : "type-526",
+   "return_type" : "type-524",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "function_name" : "android::Singleton<android::GraphicBufferAllocator>::getInstance",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE11getInstanceEv",
-   "return_type" : "type-544",
+   "return_type" : "type-541",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
@@ -9595,7 +9643,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
    "return_type" : "type-6",
@@ -9608,10 +9656,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9621,16 +9669,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1429"
+     "referenced_type" : "type-1433"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
   {
@@ -9650,7 +9698,7 @@
      "referenced_type" : "type-1119"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9664,13 +9712,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9684,13 +9732,13 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9704,16 +9752,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9727,16 +9775,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9750,16 +9798,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9773,16 +9821,16 @@
      "referenced_type" : "type-714"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h"
   },
   {
@@ -9792,10 +9840,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9805,28 +9853,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9836,7 +9884,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-636",
@@ -9849,10 +9897,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9862,7 +9910,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
    "return_type" : "type-628",
@@ -9875,7 +9923,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     },
     {
      "referenced_type" : "type-1249"
@@ -9890,7 +9938,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9900,10 +9948,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-623"
+     "referenced_type" : "type-624"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -9913,13 +9961,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9929,28 +9977,28 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-350"
+     "referenced_type" : "type-347"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9960,16 +10008,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
      "referenced_type" : "type-1122"
     },
     {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9979,16 +10027,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -9998,19 +10046,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10020,31 +10068,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10055,13 +10103,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-351"
+     "referenced_type" : "type-348"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10071,25 +10119,25 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-347"
+     "referenced_type" : "type-344"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10099,31 +10147,31 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-251"
+     "referenced_type" : "type-253"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     },
     {
-     "referenced_type" : "type-593"
+     "referenced_type" : "type-591"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10133,13 +10181,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     },
     {
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10149,7 +10197,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-345"
+     "referenced_type" : "type-342"
     }
    ],
    "return_type" : "type-6",
@@ -10162,10 +10210,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10175,16 +10223,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-973"
+     "referenced_type" : "type-974"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
   {
@@ -10194,10 +10242,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
-   "return_type" : "type-1566",
+   "return_type" : "type-1569",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10207,34 +10255,34 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
+    },
+    {
+     "referenced_type" : "type-126"
+    },
+    {
+     "referenced_type" : "type-125"
     },
     {
      "referenced_type" : "type-124"
     },
     {
-     "referenced_type" : "type-123"
-    },
-    {
-     "referenced_type" : "type-122"
-    },
-    {
-     "referenced_type" : "type-346"
+     "referenced_type" : "type-343"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
   {
@@ -10244,7 +10292,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-362"
+     "referenced_type" : "type-359"
     }
    ],
    "return_type" : "type-6",
@@ -10257,10 +10305,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10270,13 +10318,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-721"
+     "referenced_type" : "type-722"
     },
     {
      "referenced_type" : "type-723"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -10286,13 +10334,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10305,7 +10353,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-6",
@@ -10318,10 +10366,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10331,7 +10379,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10344,7 +10392,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10357,7 +10405,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10370,7 +10418,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
    "return_type" : "type-10",
@@ -10383,13 +10431,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10399,16 +10447,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
-    },
-    {
      "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-2445"
+    },
+    {
+     "referenced_type" : "type-283"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10419,10 +10467,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10432,10 +10480,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10445,10 +10493,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10458,10 +10506,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     }
    ],
-   "return_type" : "type-2427",
+   "return_type" : "type-2429",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10471,7 +10519,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1246"
@@ -10491,13 +10539,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2389",
+   "return_type" : "type-2391",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10507,13 +10555,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1050"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10523,13 +10571,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1054"
     }
    ],
-   "return_type" : "type-17",
+   "return_type" : "type-18",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10539,7 +10587,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
      "referenced_type" : "type-1280"
@@ -10555,16 +10603,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-22",
+   "return_type" : "type-23",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10574,10 +10622,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "return_type" : "type-1054",
@@ -10590,13 +10638,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2441"
+     "referenced_type" : "type-2443"
     },
     {
-     "referenced_type" : "type-2438"
+     "referenced_type" : "type-2440"
     }
    ],
-   "return_type" : "type-2434",
+   "return_type" : "type-2436",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
   {
@@ -10644,13 +10692,13 @@
      "referenced_type" : "type-1299"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-1241",
@@ -10714,7 +10762,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10727,7 +10775,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10740,7 +10788,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10753,7 +10801,7 @@
      "referenced_type" : "type-1345"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10778,7 +10826,7 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
   {
@@ -10788,13 +10836,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10804,13 +10852,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10820,19 +10868,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10842,10 +10890,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10855,10 +10903,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
    "return_type" : "type-6",
@@ -10871,7 +10919,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10884,17 +10932,17 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10904,20 +10952,20 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2395"
+     "referenced_type" : "type-2397"
     },
     {
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "default_arg" : true,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10927,7 +10975,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     }
    ],
    "return_type" : "type-1299",
@@ -10940,13 +10988,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10956,13 +11004,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10972,19 +11020,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -10994,16 +11042,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11013,7 +11061,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1284"
@@ -11029,13 +11077,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "return_type" : "type-6",
@@ -11048,10 +11096,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     }
    ],
    "return_type" : "type-1299",
@@ -11064,13 +11112,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11080,13 +11128,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11096,19 +11144,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11118,13 +11166,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11134,13 +11182,13 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-2394"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11150,19 +11198,19 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11173,16 +11221,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
      "referenced_type" : "type-1246"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11193,22 +11241,22 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11219,16 +11267,16 @@
    [
     {
      "is_this_ptr" : true,
+     "referenced_type" : "type-2396"
+    },
+    {
      "referenced_type" : "type-2394"
     },
     {
-     "referenced_type" : "type-2392"
-    },
-    {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11238,16 +11286,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2394"
+     "referenced_type" : "type-2396"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
-   "return_type" : "type-2388",
+   "return_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
@@ -11258,16 +11306,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11278,16 +11326,16 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11298,19 +11346,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11321,19 +11369,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11344,19 +11392,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11367,19 +11415,19 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-2387"
+     "referenced_type" : "type-2389"
     },
     {
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "referenced_type" : "type-1119"
     },
     {
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
-   "return_type" : "type-151",
+   "return_type" : "type-154",
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
   {
@@ -11389,10 +11437,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-1383",
+   "return_type" : "type-1387",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11402,10 +11450,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
-   "return_type" : "type-284",
+   "return_type" : "type-12",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11415,7 +11463,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1396"
+     "referenced_type" : "type-1400"
     }
    ],
    "return_type" : "type-6",
@@ -11428,10 +11476,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11441,10 +11489,10 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     }
    ],
-   "return_type" : "type-123",
+   "return_type" : "type-125",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
@@ -11454,7 +11502,7 @@
    [
     {
      "is_this_ptr" : true,
-     "referenced_type" : "type-1389"
+     "referenced_type" : "type-1394"
     },
     {
      "referenced_type" : "type-1249"
@@ -11469,24 +11517,24 @@
      "referenced_type" : "type-1250"
     }
    ],
-   "return_type" : "type-103",
+   "return_type" : "type-105",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   }
  ],
  "global_vars" :
  [
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator10sAllocListE",
    "name" : "android::GraphicBufferAllocator::sAllocList",
-   "referenced_type" : "type-1570",
+   "referenced_type" : "type-1573",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
-   "access" : "private",
+   "access" : "protected",
    "linker_set_key" : "_ZN7android22GraphicBufferAllocator5sLockE",
    "name" : "android::GraphicBufferAllocator::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
   {
@@ -11522,41 +11570,41 @@
   {
    "linker_set_key" : "_ZN7android6Region14INVALID_REGIONE",
    "name" : "android::Region::INVALID_REGION",
-   "referenced_type" : "type-2388",
+   "referenced_type" : "type-2390",
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
   {
    "linker_set_key" : "_ZN7android9FenceTime8NO_FENCEE",
    "name" : "android::FenceTime::NO_FENCE",
-   "referenced_type" : "type-1391",
+   "referenced_type" : "type-1395",
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_19GraphicBufferMapperEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferMapper>::sInstance",
-   "referenced_type" : "type-539",
+   "referenced_type" : "type-537",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE5sLockE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sLock",
-   "referenced_type" : "type-252",
+   "referenced_type" : "type-280",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
   {
    "access" : "private",
    "linker_set_key" : "_ZN7android9SingletonINS_22GraphicBufferAllocatorEE9sInstanceE",
    "name" : "android::Singleton<android::GraphicBufferAllocator>::sInstance",
-   "referenced_type" : "type-545",
+   "referenced_type" : "type-542",
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   }
  ],
@@ -11566,8 +11614,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &",
    "name" : "android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1387",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1392",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -11575,8 +11623,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot::State &",
    "name" : "android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1408",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1412",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -11584,8 +11632,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator &",
    "name" : "android::GraphicBufferAllocator &",
-   "referenced_type" : "type-542",
-   "self_type" : "type-544",
+   "referenced_type" : "type-539",
+   "self_type" : "type-541",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11593,8 +11641,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper &",
    "name" : "android::GraphicBufferMapper &",
-   "referenced_type" : "type-527",
-   "self_type" : "type-526",
+   "referenced_type" : "type-525",
+   "self_type" : "type-524",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -11611,8 +11659,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex &",
    "name" : "android::Mutex &",
-   "referenced_type" : "type-252",
-   "self_type" : "type-256",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1379",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -11629,8 +11677,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock &",
    "name" : "android::RWLock &",
-   "referenced_type" : "type-262",
-   "self_type" : "type-266",
+   "referenced_type" : "type-258",
+   "self_type" : "type-262",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -11647,8 +11695,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region &",
    "name" : "android::Region &",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2393",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2395",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -11656,8 +11704,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 &",
    "name" : "android::String16 &",
-   "referenced_type" : "type-179",
-   "self_type" : "type-188",
+   "referenced_type" : "type-182",
+   "self_type" : "type-190",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -11665,8 +11713,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 &",
    "name" : "android::String8 &",
-   "referenced_type" : "type-285",
-   "self_type" : "type-890",
+   "referenced_type" : "type-282",
+   "self_type" : "type-888",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -11674,8 +11722,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> &",
    "name" : "android::Vector<android::Rect> &",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2386",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2388",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -11692,8 +11740,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> &",
    "name" : "android::details::TMat44<float> &",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2433",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -11701,8 +11749,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> &",
    "name" : "android::details::TQuaternion<double> &",
-   "referenced_type" : "type-331",
-   "self_type" : "type-406",
+   "referenced_type" : "type-328",
+   "self_type" : "type-403",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11710,8 +11758,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> &",
    "name" : "android::details::TQuaternion<float> &",
-   "referenced_type" : "type-410",
-   "self_type" : "type-438",
+   "referenced_type" : "type-407",
+   "self_type" : "type-435",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -11728,7 +11776,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> &",
    "name" : "android::details::TVec2<double> &",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1081",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -11737,7 +11785,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> &",
    "name" : "android::details::TVec2<float> &",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1048",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11746,7 +11794,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> &",
    "name" : "android::details::TVec3<double> &",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1390",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -11755,7 +11803,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> &",
    "name" : "android::details::TVec3<float> &",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1052",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -11764,8 +11812,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> &",
    "name" : "android::details::TVec4<double> &",
-   "referenced_type" : "type-50",
-   "self_type" : "type-185",
+   "referenced_type" : "type-52",
+   "self_type" : "type-181",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11773,8 +11821,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> &",
    "name" : "android::details::TVec4<float> &",
-   "referenced_type" : "type-200",
-   "self_type" : "type-330",
+   "referenced_type" : "type-192",
+   "self_type" : "type-327",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -11782,8 +11830,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &",
-   "referenced_type" : "type-99",
-   "self_type" : "type-108",
+   "referenced_type" : "type-101",
+   "self_type" : "type-110",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11791,8 +11839,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &",
-   "referenced_type" : "type-393",
-   "self_type" : "type-400",
+   "referenced_type" : "type-392",
+   "self_type" : "type-397",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11800,8 +11848,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &",
-   "referenced_type" : "type-111",
-   "self_type" : "type-114",
+   "referenced_type" : "type-113",
+   "self_type" : "type-116",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -11818,7 +11866,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &",
    "name" : "android::hardware::Status &",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1313",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -11827,8 +11875,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1658",
-   "self_type" : "type-1657",
+   "referenced_type" : "type-1662",
+   "self_type" : "type-1661",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11836,8 +11884,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1872",
-   "self_type" : "type-1871",
+   "referenced_type" : "type-1873",
+   "self_type" : "type-1872",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11845,8 +11893,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-1948",
-   "self_type" : "type-1947",
+   "referenced_type" : "type-1950",
+   "self_type" : "type-1949",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11854,8 +11902,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-230",
-   "self_type" : "type-229",
+   "referenced_type" : "type-232",
+   "self_type" : "type-231",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11863,8 +11911,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::TextOutput &",
    "name" : "android::hardware::TextOutput &",
-   "referenced_type" : "type-431",
-   "self_type" : "type-430",
+   "referenced_type" : "type-428",
+   "self_type" : "type-427",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -11872,8 +11920,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> &",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> &",
-   "referenced_type" : "type-120",
-   "self_type" : "type-178",
+   "referenced_type" : "type-122",
+   "self_type" : "type-180",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -11890,8 +11938,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> &",
    "name" : "android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-128",
-   "self_type" : "type-131",
+   "referenced_type" : "type-131",
+   "self_type" : "type-133",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -11909,7 +11957,7 @@
    "linker_set_key" : "android::sp<android::Fence> &",
    "name" : "android::sp<android::Fence> &",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1411",
+   "self_type" : "type-1416",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11917,8 +11965,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &",
-   "referenced_type" : "type-355",
-   "self_type" : "type-377",
+   "referenced_type" : "type-352",
+   "self_type" : "type-374",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11926,8 +11974,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &",
-   "referenced_type" : "type-484",
-   "self_type" : "type-489",
+   "referenced_type" : "type-481",
+   "self_type" : "type-487",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11935,8 +11983,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &",
-   "referenced_type" : "type-338",
-   "self_type" : "type-385",
+   "referenced_type" : "type-335",
+   "self_type" : "type-382",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11944,8 +11992,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-86",
-   "self_type" : "type-93",
+   "referenced_type" : "type-88",
+   "self_type" : "type-95",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11953,8 +12001,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &",
-   "referenced_type" : "type-497",
-   "self_type" : "type-503",
+   "referenced_type" : "type-494",
+   "self_type" : "type-500",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -11962,8 +12010,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform &",
    "name" : "android::ui::Transform &",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2442",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2444",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -11986,50 +12034,50 @@
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-1771",
-   "self_type" : "type-1773",
+   "referenced_type" : "type-1772",
+   "self_type" : "type-1774",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2133",
-   "self_type" : "type-2165",
+   "referenced_type" : "type-2132",
+   "self_type" : "type-2167",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const <type-parameter-0-1> &",
    "name" : "const <type-parameter-0-1> &",
-   "referenced_type" : "type-2406",
-   "self_type" : "type-2408",
+   "referenced_type" : "type-2408",
+   "self_type" : "type-2410",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-1762",
-   "self_type" : "type-1764",
+   "referenced_type" : "type-1763",
+   "self_type" : "type-1765",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2046",
-   "self_type" : "type-2056",
+   "referenced_type" : "type-2044",
+   "self_type" : "type-2054",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-2424",
-   "self_type" : "type-2426",
+   "referenced_type" : "type-2426",
+   "self_type" : "type-2428",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "linker_set_key" : "const TMat33<T> &",
    "name" : "const TMat33<T> &",
-   "referenced_type" : "type-961",
-   "self_type" : "type-974",
+   "referenced_type" : "type-958",
+   "self_type" : "type-972",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -12045,7 +12093,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ColorSpace::TransferParameters &",
    "name" : "const android::ColorSpace::TransferParameters &",
-   "referenced_type" : "type-1033",
+   "referenced_type" : "type-1030",
    "self_type" : "type-1041",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12054,8 +12102,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot &",
    "name" : "const android::FenceTime::Snapshot &",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1394",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1398",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12063,8 +12111,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot::State &",
    "name" : "const android::FenceTime::Snapshot::State &",
-   "referenced_type" : "type-1406",
-   "self_type" : "type-1407",
+   "referenced_type" : "type-1410",
+   "self_type" : "type-1411",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -12081,8 +12129,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper &",
    "name" : "const android::Gralloc2Mapper &",
-   "referenced_type" : "type-344",
-   "self_type" : "type-354",
+   "referenced_type" : "type-341",
+   "self_type" : "type-351",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -12090,8 +12138,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2059",
-   "self_type" : "type-2058",
+   "referenced_type" : "type-2061",
+   "self_type" : "type-2060",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12099,8 +12147,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2225",
-   "self_type" : "type-2224",
+   "referenced_type" : "type-2228",
+   "self_type" : "type-2227",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12108,8 +12156,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-2229",
-   "self_type" : "type-2228",
+   "referenced_type" : "type-2231",
+   "self_type" : "type-2230",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12126,8 +12174,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-802",
-   "self_type" : "type-801",
+   "referenced_type" : "type-803",
+   "self_type" : "type-802",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12135,8 +12183,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GrallocMapper &",
    "name" : "const android::GrallocMapper &",
-   "referenced_type" : "type-827",
-   "self_type" : "type-826",
+   "referenced_type" : "type-828",
+   "self_type" : "type-827",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -12145,7 +12193,7 @@
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t &",
    "referenced_type" : "type-706",
-   "self_type" : "type-707",
+   "self_type" : "type-708",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12153,8 +12201,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper &",
    "name" : "const android::GraphicBufferMapper &",
-   "referenced_type" : "type-614",
-   "self_type" : "type-630",
+   "referenced_type" : "type-615",
+   "self_type" : "type-631",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -12180,8 +12228,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region &",
    "name" : "const android::Region &",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2392",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -12189,8 +12237,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 &",
    "name" : "const android::String16 &",
-   "referenced_type" : "type-184",
-   "self_type" : "type-187",
+   "referenced_type" : "type-187",
+   "self_type" : "type-189",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -12198,8 +12246,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 &",
    "name" : "const android::String8 &",
-   "referenced_type" : "type-873",
-   "self_type" : "type-889",
+   "referenced_type" : "type-863",
+   "self_type" : "type-879",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -12207,8 +12255,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> &",
    "name" : "const android::Vector<android::Rect> &",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2385",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -12216,8 +12264,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> &",
    "name" : "const android::details::TMat33<float> &",
-   "referenced_type" : "type-925",
-   "self_type" : "type-934",
+   "referenced_type" : "type-919",
+   "self_type" : "type-926",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -12225,8 +12273,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat44<float> &",
    "name" : "const android::details::TMat44<float> &",
-   "referenced_type" : "type-2431",
-   "self_type" : "type-2432",
+   "referenced_type" : "type-2433",
+   "self_type" : "type-2434",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -12234,8 +12282,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<double> &",
    "name" : "const android::details::TQuaternion<double> &",
-   "referenced_type" : "type-404",
-   "self_type" : "type-405",
+   "referenced_type" : "type-401",
+   "self_type" : "type-402",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12243,8 +12291,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TQuaternion<float> &",
    "name" : "const android::details::TQuaternion<float> &",
-   "referenced_type" : "type-432",
-   "self_type" : "type-433",
+   "referenced_type" : "type-429",
+   "self_type" : "type-430",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -12297,8 +12345,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<double> &",
    "name" : "const android::details::TVec4<double> &",
-   "referenced_type" : "type-166",
-   "self_type" : "type-177",
+   "referenced_type" : "type-164",
+   "self_type" : "type-171",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12306,8 +12354,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TVec4<float> &",
    "name" : "const android::details::TVec4<float> &",
-   "referenced_type" : "type-325",
-   "self_type" : "type-326",
+   "referenced_type" : "type-322",
+   "self_type" : "type-323",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -12315,8 +12363,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Parcel &",
    "name" : "const android::hardware::Parcel &",
-   "referenced_type" : "type-231",
-   "self_type" : "type-232",
+   "referenced_type" : "type-233",
+   "self_type" : "type-234",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -12378,8 +12426,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> &",
    "name" : "const android::hardware::hidl_vec<unsigned int> &",
-   "referenced_type" : "type-132",
-   "self_type" : "type-133",
+   "referenced_type" : "type-134",
+   "self_type" : "type-135",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -12397,7 +12445,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> &",
    "referenced_type" : "type-693",
-   "self_type" : "type-695",
+   "self_type" : "type-698",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12414,8 +12462,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::IBinder> &",
    "name" : "const android::sp<android::hardware::IBinder> &",
-   "referenced_type" : "type-273",
-   "self_type" : "type-272",
+   "referenced_type" : "type-269",
+   "self_type" : "type-268",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -12423,8 +12471,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &",
-   "referenced_type" : "type-91",
-   "self_type" : "type-92",
+   "referenced_type" : "type-93",
+   "self_type" : "type-94",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -12450,8 +12498,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform &",
    "name" : "const android::ui::Transform &",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2438",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2440",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -12459,7 +12507,7 @@
    "alignment" : 4,
    "linker_set_key" : "const bool &",
    "name" : "const bool &",
-   "referenced_type" : "type-370",
+   "referenced_type" : "type-367",
    "self_type" : "type-1276",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12468,7 +12516,7 @@
    "alignment" : 4,
    "linker_set_key" : "const double &",
    "name" : "const double &",
-   "referenced_type" : "type-853",
+   "referenced_type" : "type-850",
    "self_type" : "type-859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -12477,7 +12525,7 @@
    "alignment" : 4,
    "linker_set_key" : "const float &",
    "name" : "const float &",
-   "referenced_type" : "type-563",
+   "referenced_type" : "type-560",
    "self_type" : "type-1218",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -12492,30 +12540,30 @@
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-1774",
-   "self_type" : "type-1776",
+   "referenced_type" : "type-1775",
+   "self_type" : "type-1777",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2209",
+   "referenced_type" : "type-2207",
    "self_type" : "type-2221",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)> &",
-   "referenced_type" : "type-2412",
-   "self_type" : "type-2414",
+   "referenced_type" : "type-2414",
+   "self_type" : "type-2416",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "alignment" : 4,
    "linker_set_key" : "const int &",
    "name" : "const int &",
-   "referenced_type" : "type-562",
-   "self_type" : "type-837",
+   "referenced_type" : "type-559",
+   "self_type" : "type-835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12538,106 +12586,106 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-125",
-   "self_type" : "type-127",
+   "referenced_type" : "type-128",
+   "self_type" : "type-130",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1576",
-   "self_type" : "type-1578",
+   "referenced_type" : "type-1580",
+   "self_type" : "type-1582",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1611",
-   "self_type" : "type-1613",
+   "referenced_type" : "type-1616",
+   "self_type" : "type-1618",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1786",
-   "self_type" : "type-1788",
+   "referenced_type" : "type-1787",
+   "self_type" : "type-1789",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1847",
-   "self_type" : "type-1849",
+   "referenced_type" : "type-1848",
+   "self_type" : "type-1850",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1866",
-   "self_type" : "type-1868",
+   "referenced_type" : "type-1867",
+   "self_type" : "type-1869",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-1933",
-   "self_type" : "type-1935",
+   "referenced_type" : "type-1935",
+   "self_type" : "type-1937",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2079",
-   "self_type" : "type-2081",
+   "referenced_type" : "type-2081",
+   "self_type" : "type-2083",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2170",
-   "self_type" : "type-2173",
+   "referenced_type" : "type-2173",
+   "self_type" : "type-2176",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2247",
-   "self_type" : "type-2249",
+   "referenced_type" : "type-2249",
+   "self_type" : "type-2251",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2289",
-   "self_type" : "type-2291",
+   "referenced_type" : "type-2291",
+   "self_type" : "type-2293",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2340",
-   "self_type" : "type-2342",
+   "referenced_type" : "type-2342",
+   "self_type" : "type-2344",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-2471",
-   "self_type" : "type-2473",
+   "referenced_type" : "type-2473",
+   "self_type" : "type-2475",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-36",
-   "self_type" : "type-39",
+   "referenced_type" : "type-39",
+   "self_type" : "type-41",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-416",
-   "self_type" : "type-418",
+   "referenced_type" : "type-413",
+   "self_type" : "type-415",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12650,15 +12698,15 @@
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-747",
+   "referenced_type" : "type-748",
    "self_type" : "type-750",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "linker_set_key" : "const iter<is_const> &",
    "name" : "const iter<is_const> &",
-   "referenced_type" : "type-854",
-   "self_type" : "type-856",
+   "referenced_type" : "type-856",
+   "self_type" : "type-858",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -12697,8 +12745,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *const &",
    "name" : "const native_handle *const &",
-   "referenced_type" : "type-696",
-   "self_type" : "type-697",
+   "referenced_type" : "type-699",
+   "self_type" : "type-700",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12706,8 +12754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const short &",
    "name" : "const short &",
-   "referenced_type" : "type-825",
-   "self_type" : "type-829",
+   "referenced_type" : "type-823",
+   "self_type" : "type-826",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12716,7 +12764,7 @@
    "linker_set_key" : "const signed char &",
    "name" : "const signed char &",
    "referenced_type" : "type-799",
-   "self_type" : "type-804",
+   "self_type" : "type-801",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -12733,8 +12781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-1768",
-   "self_type" : "type-1770",
+   "referenced_type" : "type-1769",
+   "self_type" : "type-1771",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12742,8 +12790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3> &",
    "name" : "const std::array<android::details::TVec2<float>, 3> &",
-   "referenced_type" : "type-2121",
-   "self_type" : "type-2129",
+   "referenced_type" : "type-2119",
+   "self_type" : "type-2125",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12751,8 +12799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-1015",
-   "self_type" : "type-1029",
+   "referenced_type" : "type-1007",
+   "self_type" : "type-1021",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12760,8 +12808,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-1765",
-   "self_type" : "type-1767",
+   "referenced_type" : "type-1766",
+   "self_type" : "type-1768",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -12769,7 +12817,7 @@
    "alignment" : 4,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> > &",
-   "referenced_type" : "type-2103",
+   "referenced_type" : "type-2099",
    "self_type" : "type-2113",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
@@ -12787,8 +12835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-1777",
-   "self_type" : "type-1779",
+   "referenced_type" : "type-1778",
+   "self_type" : "type-1780",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12796,8 +12844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::function<float (float)> &",
    "name" : "const std::function<float (float)> &",
-   "referenced_type" : "type-2222",
-   "self_type" : "type-2227",
+   "referenced_type" : "type-2224",
+   "self_type" : "type-2226",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -12805,8 +12853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1391",
-   "self_type" : "type-1401",
+   "referenced_type" : "type-1395",
+   "self_type" : "type-1405",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12814,8 +12862,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-1839",
-   "self_type" : "type-1841",
+   "referenced_type" : "type-1840",
+   "self_type" : "type-1842",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12823,8 +12871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime> &",
    "name" : "const std::shared_ptr<android::FenceTime> &",
-   "referenced_type" : "type-2662",
-   "self_type" : "type-2669",
+   "referenced_type" : "type-2667",
+   "self_type" : "type-2674",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -12832,8 +12880,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> > &",
-   "referenced_type" : "type-2330",
-   "self_type" : "type-2332",
+   "referenced_type" : "type-2332",
+   "self_type" : "type-2334",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -12850,8 +12898,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1032",
+   "self_type" : "type-1031",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12868,8 +12916,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1581",
-   "self_type" : "type-1580",
+   "referenced_type" : "type-1585",
+   "self_type" : "type-1584",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12877,8 +12925,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1712",
-   "self_type" : "type-1711",
+   "referenced_type" : "type-1713",
+   "self_type" : "type-1712",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12886,8 +12934,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1825",
-   "self_type" : "type-1824",
+   "referenced_type" : "type-1826",
+   "self_type" : "type-1825",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12895,8 +12943,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1851",
-   "self_type" : "type-1850",
+   "referenced_type" : "type-1852",
+   "self_type" : "type-1851",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12904,8 +12952,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1902",
-   "self_type" : "type-1901",
+   "referenced_type" : "type-1903",
+   "self_type" : "type-1902",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12913,8 +12961,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-1993",
-   "self_type" : "type-1992",
+   "referenced_type" : "type-1994",
+   "self_type" : "type-1993",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12922,8 +12970,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2074",
-   "self_type" : "type-2073",
+   "referenced_type" : "type-2076",
+   "self_type" : "type-2075",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12931,8 +12979,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2149",
-   "self_type" : "type-2148",
+   "referenced_type" : "type-2152",
+   "self_type" : "type-2151",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12940,8 +12988,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2232",
-   "self_type" : "type-2231",
+   "referenced_type" : "type-2234",
+   "self_type" : "type-2233",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12949,8 +12997,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2327",
-   "self_type" : "type-2326",
+   "referenced_type" : "type-2329",
+   "self_type" : "type-2328",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12958,8 +13006,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2378",
-   "self_type" : "type-2377",
+   "referenced_type" : "type-2380",
+   "self_type" : "type-2379",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12967,8 +13015,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-2565",
-   "self_type" : "type-2564",
+   "referenced_type" : "type-2567",
+   "self_type" : "type-2566",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12976,8 +13024,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-328",
-   "self_type" : "type-327",
+   "referenced_type" : "type-325",
+   "self_type" : "type-324",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12985,8 +13033,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-45",
-   "self_type" : "type-44",
+   "referenced_type" : "type-47",
+   "self_type" : "type-46",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -12994,8 +13042,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-478",
-   "self_type" : "type-477",
+   "referenced_type" : "type-475",
+   "self_type" : "type-474",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13012,8 +13060,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-726",
-   "self_type" : "type-725",
+   "referenced_type" : "type-727",
+   "self_type" : "type-726",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13021,8 +13069,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-832",
-   "self_type" : "type-831",
+   "referenced_type" : "type-833",
+   "self_type" : "type-832",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13030,8 +13078,8 @@
    "alignment" : 4,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > > &",
-   "referenced_type" : "type-959",
-   "self_type" : "type-958",
+   "referenced_type" : "type-961",
+   "self_type" : "type-960",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -13039,8 +13087,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char &",
    "name" : "const unsigned char &",
-   "referenced_type" : "type-224",
-   "self_type" : "type-821",
+   "referenced_type" : "type-226",
+   "self_type" : "type-812",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13048,8 +13096,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int &",
    "name" : "const unsigned int &",
-   "referenced_type" : "type-236",
-   "self_type" : "type-846",
+   "referenced_type" : "type-238",
+   "self_type" : "type-842",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13057,7 +13105,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long &",
    "name" : "const unsigned long long &",
-   "referenced_type" : "type-226",
+   "referenced_type" : "type-228",
    "self_type" : "type-849",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -13067,7 +13115,7 @@
    "linker_set_key" : "const unsigned short &",
    "name" : "const unsigned short &",
    "referenced_type" : "type-830",
-   "self_type" : "type-834",
+   "self_type" : "type-831",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -13093,7 +13141,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &",
    "name" : "int &",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1145",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13102,7 +13150,7 @@
    "alignment" : 4,
    "linker_set_key" : "int *&",
    "name" : "int *&",
-   "referenced_type" : "type-593",
+   "referenced_type" : "type-591",
    "self_type" : "type-1347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -13111,8 +13159,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long &",
    "name" : "long long &",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1409",
+   "referenced_type" : "type-12",
+   "self_type" : "type-1413",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13120,8 +13168,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1753",
-   "self_type" : "type-1752",
+   "referenced_type" : "type-1754",
+   "self_type" : "type-1753",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13129,8 +13177,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-1854",
-   "self_type" : "type-1853",
+   "referenced_type" : "type-1855",
+   "self_type" : "type-1854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13138,8 +13186,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-2416",
-   "self_type" : "type-2415",
+   "referenced_type" : "type-2418",
+   "self_type" : "type-2417",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13147,8 +13195,8 @@
    "alignment" : 4,
    "linker_set_key" : "std::basic_ostream<char, std::char_traits<char> > &",
    "name" : "std::basic_ostream<char, std::char_traits<char> > &",
-   "referenced_type" : "type-703",
-   "self_type" : "type-702",
+   "referenced_type" : "type-696",
+   "self_type" : "type-695",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -13156,8 +13204,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-2147",
-   "self_type" : "type-2146",
+   "referenced_type" : "type-2150",
+   "self_type" : "type-2149",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -13165,8 +13213,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-2396",
-   "self_type" : "type-2395",
+   "referenced_type" : "type-2398",
+   "self_type" : "type-2397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13174,8 +13222,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-2444",
-   "self_type" : "type-2443",
+   "referenced_type" : "type-2446",
+   "self_type" : "type-2445",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -13183,8 +13231,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-2449",
-   "self_type" : "type-2448",
+   "referenced_type" : "type-2451",
+   "self_type" : "type-2450",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/UiConfig.h"
   },
@@ -13201,7 +13249,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int &",
    "name" : "unsigned int &",
-   "referenced_type" : "type-123",
+   "referenced_type" : "type-125",
    "self_type" : "type-1250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13210,7 +13258,7 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long &",
    "name" : "unsigned long long &",
-   "referenced_type" : "type-124",
+   "referenced_type" : "type-126",
    "self_type" : "type-1146",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
@@ -13219,7 +13267,7 @@
    "alignment" : 4,
    "linker_set_key" : "void *&",
    "name" : "void *&",
-   "referenced_type" : "type-227",
+   "referenced_type" : "type-229",
    "self_type" : "type-1249",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
@@ -13231,8 +13279,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-2066",
-   "self_type" : "type-2065",
+   "referenced_type" : "type-2069",
+   "self_type" : "type-2068",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13240,8 +13288,8 @@
    "alignment" : 4,
    "linker_set_key" : "AHardwareBuffer *",
    "name" : "AHardwareBuffer *",
-   "referenced_type" : "type-622",
-   "self_type" : "type-621",
+   "referenced_type" : "type-623",
+   "self_type" : "type-622",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -13249,7 +13297,7 @@
    "alignment" : 4,
    "linker_set_key" : "ANativeWindowBuffer *",
    "name" : "ANativeWindowBuffer *",
-   "referenced_type" : "type-517",
+   "referenced_type" : "type-515",
    "self_type" : "type-636",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -13276,8 +13324,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1833",
-   "self_type" : "type-1832",
+   "referenced_type" : "type-1834",
+   "self_type" : "type-1833",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13285,8 +13333,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-1838",
-   "self_type" : "type-1837",
+   "referenced_type" : "type-1839",
+   "self_type" : "type-1838",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13294,8 +13342,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2631",
-   "self_type" : "type-2630",
+   "referenced_type" : "type-2633",
+   "self_type" : "type-2632",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13303,8 +13351,8 @@
    "alignment" : 4,
    "linker_set_key" : "DIR *",
    "name" : "DIR *",
-   "referenced_type" : "type-2653",
-   "self_type" : "type-2652",
+   "referenced_type" : "type-2655",
+   "self_type" : "type-2654",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13321,8 +13369,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1414",
-   "self_type" : "type-1413",
+   "referenced_type" : "type-1418",
+   "self_type" : "type-1417",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13330,8 +13378,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1828",
-   "self_type" : "type-1827",
+   "referenced_type" : "type-1829",
+   "self_type" : "type-1828",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13339,8 +13387,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-1843",
-   "self_type" : "type-1842",
+   "referenced_type" : "type-1844",
+   "self_type" : "type-1843",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13348,8 +13396,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2621",
-   "self_type" : "type-2620",
+   "referenced_type" : "type-2623",
+   "self_type" : "type-2622",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13357,8 +13405,8 @@
    "alignment" : 4,
    "linker_set_key" : "__sFILE *",
    "name" : "__sFILE *",
-   "referenced_type" : "type-2678",
-   "self_type" : "type-2677",
+   "referenced_type" : "type-2683",
+   "self_type" : "type-2682",
    "size" : 4,
    "source_file" : "/system/core/base/include/android-base/unique_fd.h"
   },
@@ -13375,8 +13423,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-516",
-   "self_type" : "type-537",
+   "referenced_type" : "type-514",
+   "self_type" : "type-534",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -13385,7 +13433,7 @@
    "linker_set_key" : "android::ColorSpace *",
    "name" : "android::ColorSpace *",
    "referenced_type" : "type-979",
-   "self_type" : "type-1006",
+   "self_type" : "type-1000",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -13402,8 +13450,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Condition *",
    "name" : "android::Condition *",
-   "referenced_type" : "type-258",
-   "self_type" : "type-261",
+   "referenced_type" : "type-254",
+   "self_type" : "type-257",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h"
   },
@@ -13420,8 +13468,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime *",
    "name" : "android::FenceTime *",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1393",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1397",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13429,8 +13477,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot *",
    "name" : "android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1382",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1386",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13438,8 +13486,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTimeline *",
    "name" : "android::FenceTimeline *",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1400",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1404",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13447,8 +13495,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceToFenceTimeMap *",
    "name" : "android::FenceToFenceTimeMap *",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1405",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1409",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -13465,8 +13513,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FrameStats *",
    "name" : "android::FrameStats *",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1427",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1431",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -13474,8 +13522,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Allocator *",
    "name" : "android::Gralloc2Allocator *",
-   "referenced_type" : "type-353",
-   "self_type" : "type-360",
+   "referenced_type" : "type-350",
+   "self_type" : "type-357",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13483,8 +13531,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Gralloc2Mapper *",
    "name" : "android::Gralloc2Mapper *",
-   "referenced_type" : "type-337",
-   "self_type" : "type-343",
+   "referenced_type" : "type-334",
+   "self_type" : "type-340",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -13492,8 +13540,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBuffer *",
    "name" : "android::GraphicBuffer *",
-   "referenced_type" : "type-525",
-   "self_type" : "type-680",
+   "referenced_type" : "type-523",
+   "self_type" : "type-679",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13501,8 +13549,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferAllocator *",
    "name" : "android::GraphicBufferAllocator *",
-   "referenced_type" : "type-542",
-   "self_type" : "type-545",
+   "referenced_type" : "type-539",
+   "self_type" : "type-542",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13510,8 +13558,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::GraphicBufferMapper *",
    "name" : "android::GraphicBufferMapper *",
-   "referenced_type" : "type-527",
-   "self_type" : "type-539",
+   "referenced_type" : "type-525",
+   "self_type" : "type-537",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h"
   },
@@ -13528,8 +13576,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1679",
-   "self_type" : "type-1678",
+   "referenced_type" : "type-1680",
+   "self_type" : "type-1679",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13537,8 +13585,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1874",
-   "self_type" : "type-1873",
+   "referenced_type" : "type-1875",
+   "self_type" : "type-1874",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13546,8 +13594,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-1952",
-   "self_type" : "type-1951",
+   "referenced_type" : "type-1953",
+   "self_type" : "type-1952",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13555,8 +13603,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-292",
-   "self_type" : "type-291",
+   "referenced_type" : "type-289",
+   "self_type" : "type-288",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13564,8 +13612,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::IPCThreadStateBase *",
    "name" : "android::IPCThreadStateBase *",
-   "referenced_type" : "type-437",
-   "self_type" : "type-436",
+   "referenced_type" : "type-434",
+   "self_type" : "type-433",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -13573,8 +13621,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-715",
-   "self_type" : "type-716",
+   "referenced_type" : "type-716",
+   "self_type" : "type-717",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -13583,7 +13631,7 @@
    "linker_set_key" : "android::LightFlattenablePod<android::Rect> *",
    "name" : "android::LightFlattenablePod<android::Rect> *",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2399",
+   "self_type" : "type-2401",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -13600,8 +13648,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex *",
    "name" : "android::Mutex *",
-   "referenced_type" : "type-252",
-   "self_type" : "type-254",
+   "referenced_type" : "type-280",
+   "self_type" : "type-1376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13609,8 +13657,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Mutex::Autolock *",
    "name" : "android::Mutex::Autolock *",
-   "referenced_type" : "type-255",
-   "self_type" : "type-257",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h"
   },
@@ -13627,8 +13675,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock *",
    "name" : "android::RWLock *",
-   "referenced_type" : "type-262",
-   "self_type" : "type-264",
+   "referenced_type" : "type-258",
+   "self_type" : "type-260",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13636,8 +13684,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoRLock *",
    "name" : "android::RWLock::AutoRLock *",
-   "referenced_type" : "type-265",
-   "self_type" : "type-267",
+   "referenced_type" : "type-261",
+   "self_type" : "type-263",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13645,8 +13693,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RWLock::AutoWLock *",
    "name" : "android::RWLock::AutoWLock *",
-   "referenced_type" : "type-268",
-   "self_type" : "type-269",
+   "referenced_type" : "type-264",
+   "self_type" : "type-265",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h"
   },
@@ -13663,8 +13711,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase *",
    "name" : "android::RefBase *",
-   "referenced_type" : "type-172",
-   "self_type" : "type-246",
+   "referenced_type" : "type-175",
+   "self_type" : "type-248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13672,8 +13720,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-118",
-   "self_type" : "type-117",
+   "referenced_type" : "type-120",
+   "self_type" : "type-119",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13699,8 +13747,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "type-1577",
+   "self_type" : "type-1576",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13708,8 +13756,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1573",
-   "self_type" : "type-1572",
+   "referenced_type" : "type-16",
+   "self_type" : "type-15",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13717,8 +13765,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1608",
-   "self_type" : "type-1607",
+   "referenced_type" : "type-1612",
+   "self_type" : "type-1611",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13726,8 +13774,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-175",
-   "self_type" : "type-174",
+   "referenced_type" : "type-178",
+   "self_type" : "type-177",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13735,8 +13783,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1783",
-   "self_type" : "type-1782",
+   "referenced_type" : "type-1784",
+   "self_type" : "type-1783",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13744,8 +13792,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1830",
-   "self_type" : "type-1829",
+   "referenced_type" : "type-1831",
+   "self_type" : "type-1830",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13753,8 +13801,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1835",
-   "self_type" : "type-1834",
+   "referenced_type" : "type-1836",
+   "self_type" : "type-1835",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13762,8 +13810,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1845",
-   "self_type" : "type-1844",
+   "referenced_type" : "type-1846",
+   "self_type" : "type-1845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13771,8 +13819,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1864",
-   "self_type" : "type-1863",
+   "referenced_type" : "type-1865",
+   "self_type" : "type-1864",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13780,8 +13828,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-1930",
-   "self_type" : "type-1929",
+   "referenced_type" : "type-1931",
+   "self_type" : "type-1930",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13789,8 +13837,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2015",
-   "self_type" : "type-2014",
+   "referenced_type" : "type-2016",
+   "self_type" : "type-2015",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13798,8 +13846,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2167",
-   "self_type" : "type-2166",
+   "referenced_type" : "type-2170",
+   "self_type" : "type-2169",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13807,8 +13855,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2245",
-   "self_type" : "type-2244",
+   "referenced_type" : "type-2247",
+   "self_type" : "type-2246",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13816,8 +13864,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2287",
-   "self_type" : "type-2286",
+   "referenced_type" : "type-2289",
+   "self_type" : "type-2288",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13825,8 +13873,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2338",
-   "self_type" : "type-2337",
+   "referenced_type" : "type-2340",
+   "self_type" : "type-2339",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13834,8 +13882,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2457",
-   "self_type" : "type-2456",
+   "referenced_type" : "type-2459",
+   "self_type" : "type-2458",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13843,8 +13891,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2623",
-   "self_type" : "type-2622",
+   "referenced_type" : "type-2625",
+   "self_type" : "type-2624",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13852,8 +13900,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-2649",
-   "self_type" : "type-2648",
+   "referenced_type" : "type-2651",
+   "self_type" : "type-2650",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13861,8 +13909,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-408",
-   "self_type" : "type-407",
+   "referenced_type" : "type-405",
+   "self_type" : "type-404",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13870,8 +13918,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-514",
-   "self_type" : "type-513",
+   "referenced_type" : "type-511",
+   "self_type" : "type-510",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13879,8 +13927,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-744",
-   "self_type" : "type-743",
+   "referenced_type" : "type-745",
+   "self_type" : "type-744",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13888,8 +13936,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_impl *",
    "name" : "android::RefBase::weakref_impl *",
-   "referenced_type" : "type-851",
-   "self_type" : "type-850",
+   "referenced_type" : "type-852",
+   "self_type" : "type-851",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -13915,8 +13963,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::RefBase::weakref_type *",
    "name" : "android::RefBase::weakref_type *",
-   "referenced_type" : "type-198",
-   "self_type" : "type-197",
+   "referenced_type" : "type-211",
+   "self_type" : "type-210",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -13933,8 +13981,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Region *",
    "name" : "android::Region *",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2391",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2393",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -13960,8 +14008,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String16 *",
    "name" : "android::String16 *",
-   "referenced_type" : "type-179",
-   "self_type" : "type-189",
+   "referenced_type" : "type-182",
+   "self_type" : "type-191",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -13969,8 +14017,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::String8 *",
    "name" : "android::String8 *",
-   "referenced_type" : "type-285",
-   "self_type" : "type-901",
+   "referenced_type" : "type-282",
+   "self_type" : "type-891",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -13978,8 +14026,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Thread *",
    "name" : "android::Thread *",
-   "referenced_type" : "type-369",
-   "self_type" : "type-368",
+   "referenced_type" : "type-366",
+   "self_type" : "type-365",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -13987,8 +14035,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<android::Rect> *",
    "name" : "android::Vector<android::Rect> *",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2383",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -13996,8 +14044,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::Vector<long long> *",
    "name" : "android::Vector<long long> *",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1424",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1428",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -14032,8 +14080,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMat44<float> *",
    "name" : "android::details::TMat44<float> *",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2430",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2432",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -14042,7 +14090,7 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat33, float> *",
    "referenced_type" : "type-910",
-   "self_type" : "type-957",
+   "self_type" : "type-949",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14050,8 +14098,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float> *",
    "name" : "android::details::TMatTransform<android::details::TMat44, float> *",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2422",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2424",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -14059,8 +14107,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<double> *",
    "name" : "android::details::TQuaternion<double> *",
-   "referenced_type" : "type-331",
-   "self_type" : "type-397",
+   "referenced_type" : "type-328",
+   "self_type" : "type-391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14068,8 +14116,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TQuaternion<float> *",
    "name" : "android::details::TQuaternion<float> *",
-   "referenced_type" : "type-410",
-   "self_type" : "type-429",
+   "referenced_type" : "type-407",
+   "self_type" : "type-426",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -14086,7 +14134,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<double> *",
    "name" : "android::details::TVec2<double> *",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1069",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14095,7 +14143,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec2<float> *",
    "name" : "android::details::TVec2<float> *",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1245",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -14104,7 +14152,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<double> *",
    "name" : "android::details::TVec3<double> *",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1368",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -14113,8 +14161,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec3<float> *",
    "name" : "android::details::TVec3<float> *",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "type-18",
+   "self_type" : "type-17",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -14122,8 +14170,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<double> *",
    "name" : "android::details::TVec4<double> *",
-   "referenced_type" : "type-50",
-   "self_type" : "type-155",
+   "referenced_type" : "type-52",
+   "self_type" : "type-151",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14131,8 +14179,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVec4<float> *",
    "name" : "android::details::TVec4<float> *",
-   "referenced_type" : "type-200",
-   "self_type" : "type-316",
+   "referenced_type" : "type-192",
+   "self_type" : "type-311",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -14140,7 +14188,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-28",
+   "referenced_type" : "type-29",
    "self_type" : "type-1049",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14149,7 +14197,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-34",
+   "referenced_type" : "type-35",
    "self_type" : "type-1053",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14158,7 +14206,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float> *",
-   "referenced_type" : "type-27",
+   "referenced_type" : "type-28",
    "self_type" : "type-1057",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14167,7 +14215,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float> *",
-   "referenced_type" : "type-33",
+   "referenced_type" : "type-34",
    "self_type" : "type-1058",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -14177,7 +14225,7 @@
    "linker_set_key" : "android::half *",
    "name" : "android::half *",
    "referenced_type" : "type-1",
-   "self_type" : "type-1381",
+   "self_type" : "type-1377",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -14203,8 +14251,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::BHwBinder *",
    "name" : "android::hardware::BHwBinder *",
-   "referenced_type" : "type-242",
-   "self_type" : "type-241",
+   "referenced_type" : "type-244",
+   "self_type" : "type-243",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14221,8 +14269,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::IBinder *",
    "name" : "android::hardware::IBinder *",
-   "referenced_type" : "type-196",
-   "self_type" : "type-195",
+   "referenced_type" : "type-209",
+   "self_type" : "type-208",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14230,8 +14278,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Parcel *",
    "name" : "android::hardware::Parcel *",
-   "referenced_type" : "type-215",
-   "self_type" : "type-222",
+   "referenced_type" : "type-217",
+   "self_type" : "type-224",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -14239,8 +14287,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::ProcessState *",
    "name" : "android::hardware::ProcessState *",
-   "referenced_type" : "type-281",
-   "self_type" : "type-280",
+   "referenced_type" : "type-277",
+   "self_type" : "type-276",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14248,8 +14296,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-99",
-   "self_type" : "type-106",
+   "referenced_type" : "type-101",
+   "self_type" : "type-108",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14257,8 +14305,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-393",
-   "self_type" : "type-398",
+   "referenced_type" : "type-392",
+   "self_type" : "type-395",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14266,8 +14314,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-111",
-   "self_type" : "type-112",
+   "referenced_type" : "type-113",
+   "self_type" : "type-114",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -14284,7 +14332,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status *",
    "name" : "android::hardware::Status *",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1309",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14311,8 +14359,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-120",
-   "self_type" : "type-169",
+   "referenced_type" : "type-122",
+   "self_type" : "type-172",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14320,7 +14368,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status *",
    "name" : "android::hardware::details::return_status *",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1315",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -14329,8 +14377,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1727",
-   "self_type" : "type-1726",
+   "referenced_type" : "type-1728",
+   "self_type" : "type-1727",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14338,8 +14386,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1909",
-   "self_type" : "type-1908",
+   "referenced_type" : "type-1910",
+   "self_type" : "type-1909",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14347,8 +14395,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2115",
-   "self_type" : "type-2114",
+   "referenced_type" : "type-2118",
+   "self_type" : "type-2117",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14356,8 +14404,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2153",
-   "self_type" : "type-2152",
+   "referenced_type" : "type-2156",
+   "self_type" : "type-2155",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14365,8 +14413,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-2235",
-   "self_type" : "type-2234",
+   "referenced_type" : "type-2237",
+   "self_type" : "type-2236",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14374,8 +14422,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-357",
-   "self_type" : "type-356",
+   "referenced_type" : "type-354",
+   "self_type" : "type-353",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14383,8 +14431,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-685",
-   "self_type" : "type-684",
+   "referenced_type" : "type-687",
+   "self_type" : "type-686",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14401,8 +14449,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-836",
-   "self_type" : "type-835",
+   "referenced_type" : "type-837",
+   "self_type" : "type-836",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14410,8 +14458,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-1997",
-   "self_type" : "type-1996",
+   "referenced_type" : "type-1998",
+   "self_type" : "type-1997",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14419,8 +14467,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2160",
-   "self_type" : "type-2159",
+   "referenced_type" : "type-2163",
+   "self_type" : "type-2162",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14428,8 +14476,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2241",
-   "self_type" : "type-2240",
+   "referenced_type" : "type-2243",
+   "self_type" : "type-2242",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14437,8 +14485,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-486",
-   "self_type" : "type-485",
+   "referenced_type" : "type-483",
+   "self_type" : "type-482",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14446,8 +14494,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-737",
-   "self_type" : "type-736",
+   "referenced_type" : "type-738",
+   "self_type" : "type-737",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14455,8 +14503,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-843",
-   "self_type" : "type-842",
+   "referenced_type" : "type-844",
+   "self_type" : "type-843",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14464,8 +14512,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1716",
-   "self_type" : "type-1715",
+   "referenced_type" : "type-1717",
+   "self_type" : "type-1716",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14473,8 +14521,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1915",
-   "self_type" : "type-1914",
+   "referenced_type" : "type-1916",
+   "self_type" : "type-1915",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14482,8 +14530,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2118",
-   "self_type" : "type-2117",
+   "referenced_type" : "type-2122",
+   "self_type" : "type-2121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14491,8 +14539,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2155",
-   "self_type" : "type-2154",
+   "referenced_type" : "type-2158",
+   "self_type" : "type-2157",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14500,8 +14548,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-2237",
-   "self_type" : "type-2236",
+   "referenced_type" : "type-2239",
+   "self_type" : "type-2238",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14509,8 +14557,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-340",
-   "self_type" : "type-339",
+   "referenced_type" : "type-337",
+   "self_type" : "type-336",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14545,8 +14593,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1587",
-   "self_type" : "type-1586",
+   "referenced_type" : "type-1591",
+   "self_type" : "type-1590",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14554,8 +14602,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1859",
-   "self_type" : "type-1858",
+   "referenced_type" : "type-1860",
+   "self_type" : "type-1859",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14563,8 +14611,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2120",
-   "self_type" : "type-2119",
+   "referenced_type" : "type-2124",
+   "self_type" : "type-2123",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14572,8 +14620,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2158",
-   "self_type" : "type-2157",
+   "referenced_type" : "type-2161",
+   "self_type" : "type-2160",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14581,8 +14629,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-2239",
-   "self_type" : "type-2238",
+   "referenced_type" : "type-2241",
+   "self_type" : "type-2240",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14617,8 +14665,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-88",
-   "self_type" : "type-87",
+   "referenced_type" : "type-90",
+   "self_type" : "type-89",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14626,8 +14674,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1724",
-   "self_type" : "type-1723",
+   "referenced_type" : "type-1725",
+   "self_type" : "type-1724",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14635,8 +14683,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-1906",
-   "self_type" : "type-1905",
+   "referenced_type" : "type-1908",
+   "self_type" : "type-1907",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14644,8 +14692,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
    "name" : "android::hardware::graphics::mapper::V2_1::IMapper::BufferDescriptorInfo *",
-   "referenced_type" : "type-352",
-   "self_type" : "type-351",
+   "referenced_type" : "type-349",
+   "self_type" : "type-348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14653,8 +14701,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2007",
-   "self_type" : "type-2006",
+   "referenced_type" : "type-2008",
+   "self_type" : "type-2007",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14662,8 +14710,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2163",
-   "self_type" : "type-2162",
+   "referenced_type" : "type-2166",
+   "self_type" : "type-2165",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14671,8 +14719,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-2243",
-   "self_type" : "type-2242",
+   "referenced_type" : "type-2245",
+   "self_type" : "type-2244",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14680,8 +14728,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-499",
-   "self_type" : "type-498",
+   "referenced_type" : "type-496",
+   "self_type" : "type-495",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14698,8 +14746,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-845",
-   "self_type" : "type-844",
+   "referenced_type" : "type-846",
+   "self_type" : "type-845",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14725,8 +14773,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle *",
    "name" : "android::hardware::hidl_handle *",
-   "referenced_type" : "type-139",
-   "self_type" : "type-138",
+   "referenced_type" : "type-142",
+   "self_type" : "type-141",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -14743,8 +14791,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int> *",
    "name" : "android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-128",
-   "self_type" : "type-129",
+   "referenced_type" : "type-131",
+   "self_type" : "type-132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -14761,8 +14809,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::base::V1_0::IBase *",
    "name" : "android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-171",
-   "self_type" : "type-364",
+   "referenced_type" : "type-174",
+   "self_type" : "type-361",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14770,8 +14818,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-295",
-   "self_type" : "type-372",
+   "referenced_type" : "type-292",
+   "self_type" : "type-369",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14780,7 +14828,7 @@
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-694",
-   "self_type" : "type-698",
+   "self_type" : "type-701",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -14797,8 +14845,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::GraphicBuffer> *",
    "name" : "android::sp<android::GraphicBuffer> *",
-   "referenced_type" : "type-679",
-   "self_type" : "type-681",
+   "referenced_type" : "type-678",
+   "self_type" : "type-682",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14806,8 +14854,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-355",
-   "self_type" : "type-376",
+   "referenced_type" : "type-352",
+   "self_type" : "type-373",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14815,8 +14863,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-484",
-   "self_type" : "type-488",
+   "referenced_type" : "type-481",
+   "self_type" : "type-486",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14824,8 +14872,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-338",
-   "self_type" : "type-384",
+   "referenced_type" : "type-335",
+   "self_type" : "type-381",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14833,8 +14881,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-86",
-   "self_type" : "type-90",
+   "referenced_type" : "type-88",
+   "self_type" : "type-92",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14842,8 +14890,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-497",
-   "self_type" : "type-502",
+   "referenced_type" : "type-494",
+   "self_type" : "type-499",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14851,8 +14899,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-371",
-   "self_type" : "type-373",
+   "referenced_type" : "type-368",
+   "self_type" : "type-370",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -14869,8 +14917,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform *",
    "name" : "android::ui::Transform *",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2436",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2438",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14878,8 +14926,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::ui::Transform::mat33 *",
    "name" : "android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2447",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2449",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -14896,8 +14944,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_native_base_t *",
    "name" : "android_native_base_t *",
-   "referenced_type" : "type-518",
-   "self_type" : "type-522",
+   "referenced_type" : "type-516",
+   "self_type" : "type-520",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -14905,8 +14953,8 @@
    "alignment" : 4,
    "linker_set_key" : "android_ycbcr *",
    "name" : "android_ycbcr *",
-   "referenced_type" : "type-348",
-   "self_type" : "type-347",
+   "referenced_type" : "type-345",
+   "self_type" : "type-344",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14914,8 +14962,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-271",
-   "self_type" : "type-274",
+   "referenced_type" : "type-267",
+   "self_type" : "type-270",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -14924,7 +14972,7 @@
    "linker_set_key" : "bool *",
    "name" : "bool *",
    "referenced_type" : "type-6",
-   "self_type" : "type-350",
+   "self_type" : "type-347",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -14932,8 +14980,8 @@
    "alignment" : 4,
    "linker_set_key" : "char *",
    "name" : "char *",
-   "referenced_type" : "type-288",
-   "self_type" : "type-576",
+   "referenced_type" : "type-285",
+   "self_type" : "type-573",
    "size" : 4,
    "source_file" : "/system/core/liblog/include/log/log_read.h"
   },
@@ -14941,8 +14989,8 @@
    "alignment" : 4,
    "linker_set_key" : "const AHardwareBuffer *",
    "name" : "const AHardwareBuffer *",
-   "referenced_type" : "type-2069",
-   "self_type" : "type-2071",
+   "referenced_type" : "type-2071",
+   "self_type" : "type-2073",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -14959,7 +15007,7 @@
    "alignment" : 4,
    "linker_set_key" : "const ANativeWindowBuffer *",
    "name" : "const ANativeWindowBuffer *",
-   "referenced_type" : "type-637",
+   "referenced_type" : "type-638",
    "self_type" : "type-639",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
@@ -14968,8 +15016,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t> *",
-   "referenced_type" : "type-535",
-   "self_type" : "type-536",
+   "referenced_type" : "type-532",
+   "self_type" : "type-533",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -15004,8 +15052,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime *",
    "name" : "const android::FenceTime *",
-   "referenced_type" : "type-1395",
-   "self_type" : "type-1396",
+   "referenced_type" : "type-1399",
+   "self_type" : "type-1400",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15013,8 +15061,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FenceTime::Snapshot *",
    "name" : "const android::FenceTime::Snapshot *",
-   "referenced_type" : "type-1388",
-   "self_type" : "type-1389",
+   "referenced_type" : "type-1393",
+   "self_type" : "type-1394",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -15031,8 +15079,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::FrameStats *",
    "name" : "const android::FrameStats *",
-   "referenced_type" : "type-1428",
-   "self_type" : "type-1429",
+   "referenced_type" : "type-1432",
+   "self_type" : "type-1433",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -15040,8 +15088,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Allocator *",
    "name" : "const android::Gralloc2Allocator *",
-   "referenced_type" : "type-361",
-   "self_type" : "type-362",
+   "referenced_type" : "type-358",
+   "self_type" : "type-359",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15049,8 +15097,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Gralloc2Mapper *",
    "name" : "const android::Gralloc2Mapper *",
-   "referenced_type" : "type-344",
-   "self_type" : "type-345",
+   "referenced_type" : "type-341",
+   "self_type" : "type-342",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15058,8 +15106,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBuffer *",
    "name" : "const android::GraphicBuffer *",
-   "referenced_type" : "type-624",
-   "self_type" : "type-623",
+   "referenced_type" : "type-625",
+   "self_type" : "type-624",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -15067,8 +15115,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferAllocator *",
    "name" : "const android::GraphicBufferAllocator *",
-   "referenced_type" : "type-720",
-   "self_type" : "type-721",
+   "referenced_type" : "type-721",
+   "self_type" : "type-722",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -15076,8 +15124,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::GraphicBufferMapper *",
    "name" : "const android::GraphicBufferMapper *",
-   "referenced_type" : "type-614",
-   "self_type" : "type-615",
+   "referenced_type" : "type-615",
+   "self_type" : "type-616",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -15085,8 +15133,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::HdrCapabilities *",
    "name" : "const android::HdrCapabilities *",
-   "referenced_type" : "type-972",
-   "self_type" : "type-973",
+   "referenced_type" : "type-973",
+   "self_type" : "type-974",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -15094,8 +15142,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
-   "referenced_type" : "type-717",
-   "self_type" : "type-718",
+   "referenced_type" : "type-718",
+   "self_type" : "type-719",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -15103,8 +15151,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect> *",
    "name" : "const android::LightFlattenablePod<android::Rect> *",
-   "referenced_type" : "type-2397",
-   "self_type" : "type-2398",
+   "referenced_type" : "type-2399",
+   "self_type" : "type-2400",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -15157,8 +15205,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Region *",
    "name" : "const android::Region *",
-   "referenced_type" : "type-2388",
-   "self_type" : "type-2394",
+   "referenced_type" : "type-2390",
+   "self_type" : "type-2396",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -15175,8 +15223,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String16 *",
    "name" : "const android::String16 *",
-   "referenced_type" : "type-184",
-   "self_type" : "type-186",
+   "referenced_type" : "type-187",
+   "self_type" : "type-188",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15184,8 +15232,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::String8 *",
    "name" : "const android::String8 *",
-   "referenced_type" : "type-873",
-   "self_type" : "type-878",
+   "referenced_type" : "type-863",
+   "self_type" : "type-874",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15193,8 +15241,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<android::Rect> *",
    "name" : "const android::Vector<android::Rect> *",
-   "referenced_type" : "type-2384",
-   "self_type" : "type-2387",
+   "referenced_type" : "type-2386",
+   "self_type" : "type-2389",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15202,8 +15250,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::Vector<long long> *",
    "name" : "const android::Vector<long long> *",
-   "referenced_type" : "type-1425",
-   "self_type" : "type-1426",
+   "referenced_type" : "type-1429",
+   "self_type" : "type-1430",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -15211,8 +15259,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::VectorImpl *",
    "name" : "const android::VectorImpl *",
-   "referenced_type" : "type-1422",
-   "self_type" : "type-1423",
+   "referenced_type" : "type-1426",
+   "self_type" : "type-1427",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -15229,7 +15277,7 @@
    "alignment" : 4,
    "linker_set_key" : "const android::details::TMat33<float> *",
    "name" : "const android::details::TMat33<float> *",
-   "referenced_type" : "type-925",
+   "referenced_type" : "type-919",
    "self_type" : "type-976",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
@@ -15257,7 +15305,7 @@
    "linker_set_key" : "const android::details::TVec3<float> *",
    "name" : "const android::details::TVec3<float> *",
    "referenced_type" : "type-1055",
-   "self_type" : "type-1418",
+   "self_type" : "type-1419",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
   },
@@ -15265,8 +15313,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::half *",
    "name" : "const android::half *",
-   "referenced_type" : "type-42",
-   "self_type" : "type-130",
+   "referenced_type" : "type-44",
+   "self_type" : "type-127",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -15292,8 +15340,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::BpHwRefBase *",
    "name" : "const android::hardware::BpHwRefBase *",
-   "referenced_type" : "type-211",
-   "self_type" : "type-212",
+   "referenced_type" : "type-213",
+   "self_type" : "type-214",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -15301,8 +15349,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> *",
-   "referenced_type" : "type-109",
-   "self_type" : "type-110",
+   "referenced_type" : "type-111",
+   "self_type" : "type-112",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15310,8 +15358,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> *",
-   "referenced_type" : "type-401",
-   "self_type" : "type-402",
+   "referenced_type" : "type-398",
+   "self_type" : "type-400",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15319,8 +15367,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > *",
-   "referenced_type" : "type-115",
-   "self_type" : "type-116",
+   "referenced_type" : "type-117",
+   "self_type" : "type-118",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -15346,8 +15394,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-293",
-   "self_type" : "type-297",
+   "referenced_type" : "type-290",
+   "self_type" : "type-294",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15355,8 +15403,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int> *",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int> *",
-   "referenced_type" : "type-190",
-   "self_type" : "type-214",
+   "referenced_type" : "type-203",
+   "self_type" : "type-216",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15373,8 +15421,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1744",
-   "self_type" : "type-1746",
+   "referenced_type" : "type-1745",
+   "self_type" : "type-1747",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15382,8 +15430,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-1910",
-   "self_type" : "type-1913",
+   "referenced_type" : "type-1912",
+   "self_type" : "type-1914",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15391,8 +15439,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator *",
-   "referenced_type" : "type-381",
-   "self_type" : "type-383",
+   "referenced_type" : "type-378",
+   "self_type" : "type-380",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15400,8 +15448,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-2003",
-   "self_type" : "type-2005",
+   "referenced_type" : "type-2004",
+   "self_type" : "type-2006",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15409,8 +15457,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator *",
-   "referenced_type" : "type-494",
-   "self_type" : "type-496",
+   "referenced_type" : "type-491",
+   "self_type" : "type-493",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15418,8 +15466,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage *",
-   "referenced_type" : "type-153",
-   "self_type" : "type-152",
+   "referenced_type" : "type-156",
+   "self_type" : "type-155",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15427,8 +15475,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage *",
-   "referenced_type" : "type-160",
-   "self_type" : "type-159",
+   "referenced_type" : "type-162",
+   "self_type" : "type-161",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15436,8 +15484,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage *",
-   "referenced_type" : "type-422",
-   "self_type" : "type-421",
+   "referenced_type" : "type-419",
+   "self_type" : "type-418",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15445,8 +15493,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1584",
-   "self_type" : "type-1583",
+   "referenced_type" : "type-1588",
+   "self_type" : "type-1587",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15454,8 +15502,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-1856",
-   "self_type" : "type-1855",
+   "referenced_type" : "type-1857",
+   "self_type" : "type-1856",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15463,8 +15511,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper *",
-   "referenced_type" : "type-84",
-   "self_type" : "type-83",
+   "referenced_type" : "type-86",
+   "self_type" : "type-85",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15472,8 +15520,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1594",
-   "self_type" : "type-1596",
+   "referenced_type" : "type-1598",
+   "self_type" : "type-1600",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15481,8 +15529,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-1860",
-   "self_type" : "type-1862",
+   "referenced_type" : "type-1861",
+   "self_type" : "type-1863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15490,8 +15538,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper *",
-   "referenced_type" : "type-96",
-   "self_type" : "type-98",
+   "referenced_type" : "type-98",
+   "self_type" : "type-100",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15499,8 +15547,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-1918",
-   "self_type" : "type-1917",
+   "referenced_type" : "type-1919",
+   "self_type" : "type-1918",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15508,8 +15556,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper *",
-   "referenced_type" : "type-391",
-   "self_type" : "type-390",
+   "referenced_type" : "type-388",
+   "self_type" : "type-387",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15526,8 +15574,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void> *",
-   "referenced_type" : "type-154",
-   "self_type" : "type-156",
+   "referenced_type" : "type-157",
+   "self_type" : "type-158",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15535,8 +15583,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void> *",
-   "referenced_type" : "type-161",
-   "self_type" : "type-162",
+   "referenced_type" : "type-163",
+   "self_type" : "type-165",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15544,8 +15592,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void> *",
-   "referenced_type" : "type-423",
-   "self_type" : "type-424",
+   "referenced_type" : "type-420",
+   "self_type" : "type-421",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15562,8 +15610,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle> *",
-   "referenced_type" : "type-146",
-   "self_type" : "type-147",
+   "referenced_type" : "type-149",
+   "self_type" : "type-150",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15571,8 +15619,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int> *",
    "name" : "const android::hardware::hidl_vec<unsigned int> *",
-   "referenced_type" : "type-132",
-   "self_type" : "type-134",
+   "referenced_type" : "type-134",
+   "self_type" : "type-136",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -15589,8 +15637,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase *",
    "name" : "const android::hidl::base::V1_0::IBase *",
-   "referenced_type" : "type-170",
-   "self_type" : "type-176",
+   "referenced_type" : "type-173",
+   "self_type" : "type-179",
    "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/IBase.h"
   },
@@ -15598,8 +15646,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::hidl::manager::V1_0::IServiceNotification *",
    "name" : "const android::hidl::manager::V1_0::IServiceNotification *",
-   "referenced_type" : "type-294",
-   "self_type" : "type-296",
+   "referenced_type" : "type-291",
+   "self_type" : "type-293",
    "size" : 4,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/manager/1.0/android.hidl.manager@1.0_genc++_headers/gen/android/hidl/manager/1.0/IServiceNotification.h"
   },
@@ -15608,7 +15656,7 @@
    "linker_set_key" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "name" : "const android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> *",
    "referenced_type" : "type-693",
-   "self_type" : "type-699",
+   "self_type" : "type-702",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15625,8 +15673,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> *",
-   "referenced_type" : "type-379",
-   "self_type" : "type-380",
+   "referenced_type" : "type-376",
+   "self_type" : "type-377",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15634,8 +15682,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> *",
-   "referenced_type" : "type-492",
-   "self_type" : "type-493",
+   "referenced_type" : "type-489",
+   "self_type" : "type-490",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15643,8 +15691,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper> *",
-   "referenced_type" : "type-387",
-   "self_type" : "type-388",
+   "referenced_type" : "type-384",
+   "self_type" : "type-385",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15652,8 +15700,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper> *",
-   "referenced_type" : "type-91",
-   "self_type" : "type-95",
+   "referenced_type" : "type-93",
+   "self_type" : "type-97",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15661,8 +15709,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper> *",
-   "referenced_type" : "type-505",
-   "self_type" : "type-506",
+   "referenced_type" : "type-502",
+   "self_type" : "type-503",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15679,8 +15727,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-365",
-   "self_type" : "type-366",
+   "referenced_type" : "type-362",
+   "self_type" : "type-363",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15688,8 +15736,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-374",
-   "self_type" : "type-375",
+   "referenced_type" : "type-371",
+   "self_type" : "type-372",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -15706,8 +15754,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform *",
    "name" : "const android::ui::Transform *",
-   "referenced_type" : "type-2437",
-   "self_type" : "type-2441",
+   "referenced_type" : "type-2439",
+   "self_type" : "type-2443",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15715,8 +15763,8 @@
    "alignment" : 4,
    "linker_set_key" : "const android::ui::Transform::mat33 *",
    "name" : "const android::ui::Transform::mat33 *",
-   "referenced_type" : "type-2445",
-   "self_type" : "type-2446",
+   "referenced_type" : "type-2447",
+   "self_type" : "type-2448",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -15724,8 +15772,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char *",
    "name" : "const char *",
-   "referenced_type" : "type-287",
-   "self_type" : "type-286",
+   "referenced_type" : "type-284",
+   "self_type" : "type-283",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -15733,8 +15781,8 @@
    "alignment" : 4,
    "linker_set_key" : "const char16_t *",
    "name" : "const char16_t *",
-   "referenced_type" : "type-181",
-   "self_type" : "type-180",
+   "referenced_type" : "type-184",
+   "self_type" : "type-183",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -15742,8 +15790,8 @@
    "alignment" : 4,
    "linker_set_key" : "const gralloc_module_t *",
    "name" : "const gralloc_module_t *",
-   "referenced_type" : "type-582",
-   "self_type" : "type-581",
+   "referenced_type" : "type-580",
+   "self_type" : "type-579",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15751,8 +15799,8 @@
    "alignment" : 4,
    "linker_set_key" : "const hw_module_t *",
    "name" : "const hw_module_t *",
-   "referenced_type" : "type-555",
-   "self_type" : "type-554",
+   "referenced_type" : "type-552",
+   "self_type" : "type-551",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15760,7 +15808,7 @@
    "alignment" : 4,
    "linker_set_key" : "const int *",
    "name" : "const int *",
-   "referenced_type" : "type-562",
+   "referenced_type" : "type-559",
    "self_type" : "type-1348",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
@@ -15779,7 +15827,7 @@
    "linker_set_key" : "const long long *",
    "name" : "const long long *",
    "referenced_type" : "type-847",
-   "self_type" : "type-1415",
+   "self_type" : "type-1420",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -15787,8 +15835,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle *",
    "name" : "const native_handle *",
-   "referenced_type" : "type-143",
-   "self_type" : "type-142",
+   "referenced_type" : "type-146",
+   "self_type" : "type-145",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -15796,8 +15844,8 @@
    "alignment" : 4,
    "linker_set_key" : "const native_handle **",
    "name" : "const native_handle **",
-   "referenced_type" : "type-142",
-   "self_type" : "type-346",
+   "referenced_type" : "type-145",
+   "self_type" : "type-343",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -15805,8 +15853,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned char *",
    "name" : "const unsigned char *",
-   "referenced_type" : "type-224",
-   "self_type" : "type-223",
+   "referenced_type" : "type-226",
+   "self_type" : "type-225",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15814,7 +15862,7 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned int *",
    "name" : "const unsigned int *",
-   "referenced_type" : "type-236",
+   "referenced_type" : "type-238",
    "self_type" : "type-1104",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -15823,8 +15871,8 @@
    "alignment" : 4,
    "linker_set_key" : "const unsigned long long *",
    "name" : "const unsigned long long *",
-   "referenced_type" : "type-226",
-   "self_type" : "type-225",
+   "referenced_type" : "type-228",
+   "self_type" : "type-227",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -15841,8 +15889,8 @@
    "alignment" : 4,
    "linker_set_key" : "framebuffer_device_t *",
    "name" : "framebuffer_device_t *",
-   "referenced_type" : "type-546",
-   "self_type" : "type-567",
+   "referenced_type" : "type-543",
+   "self_type" : "type-564",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15850,8 +15898,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t *",
    "name" : "hw_device_t *",
-   "referenced_type" : "type-547",
-   "self_type" : "type-557",
+   "referenced_type" : "type-544",
+   "self_type" : "type-554",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15859,8 +15907,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_device_t **",
    "name" : "hw_device_t **",
-   "referenced_type" : "type-557",
-   "self_type" : "type-556",
+   "referenced_type" : "type-554",
+   "self_type" : "type-553",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15868,8 +15916,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_methods_t *",
    "name" : "hw_module_methods_t *",
-   "referenced_type" : "type-551",
-   "self_type" : "type-550",
+   "referenced_type" : "type-548",
+   "self_type" : "type-547",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15877,8 +15925,8 @@
    "alignment" : 4,
    "linker_set_key" : "hw_module_t *",
    "name" : "hw_module_t *",
-   "referenced_type" : "type-549",
-   "self_type" : "type-548",
+   "referenced_type" : "type-546",
+   "self_type" : "type-545",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15904,8 +15952,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *)",
-   "referenced_type" : "type-580",
-   "self_type" : "type-579",
+   "referenced_type" : "type-578",
+   "self_type" : "type-577",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -15913,42 +15961,6 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
    "name" : "int (*)(const gralloc_module_t *, const native_handle *, int *)",
-   "referenced_type" : "type-592",
-   "self_type" : "type-591",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
-   "referenced_type" : "type-588",
-   "self_type" : "type-587",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
-   "referenced_type" : "type-595",
-   "self_type" : "type-594",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
-   "referenced_type" : "type-584",
-   "self_type" : "type-583",
-   "size" : 4,
-   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
-   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
    "referenced_type" : "type-590",
    "self_type" : "type-589",
    "size" : 4,
@@ -15956,8 +15968,8 @@
   },
   {
    "alignment" : 4,
-   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
-   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *)",
    "referenced_type" : "type-586",
    "self_type" : "type-585",
    "size" : 4,
@@ -15965,10 +15977,64 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, android_ycbcr *, int)",
+   "referenced_type" : "type-593",
+   "self_type" : "type-592",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **)",
+   "referenced_type" : "type-582",
+   "self_type" : "type-581",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, int, int, int, int, int, void **, int)",
+   "referenced_type" : "type-588",
+   "self_type" : "type-587",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int *, unsigned int *)",
+   "referenced_type" : "type-595",
+   "self_type" : "type-594",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "name" : "int (*)(const gralloc_module_t *, const native_handle *, unsigned int, unsigned int, int, int, unsigned int)",
+   "referenced_type" : "type-597",
+   "self_type" : "type-596",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
+   "linker_set_key" : "int (*)(const gralloc_module_t *, int, ...)",
+   "name" : "int (*)(const gralloc_module_t *, int, ...)",
+   "referenced_type" : "type-584",
+   "self_type" : "type-583",
+   "size" : 4,
+   "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
    "name" : "int (*)(const hw_module_t *, const char *, hw_device_t **)",
-   "referenced_type" : "type-553",
-   "self_type" : "type-552",
+   "referenced_type" : "type-550",
+   "self_type" : "type-549",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -15976,8 +16042,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *)",
    "name" : "int (*)(framebuffer_device_t *)",
-   "referenced_type" : "type-573",
-   "self_type" : "type-572",
+   "referenced_type" : "type-570",
+   "self_type" : "type-569",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15985,8 +16051,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, const native_handle *)",
    "name" : "int (*)(framebuffer_device_t *, const native_handle *)",
-   "referenced_type" : "type-571",
-   "self_type" : "type-570",
+   "referenced_type" : "type-568",
+   "self_type" : "type-567",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -15994,8 +16060,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int)",
    "name" : "int (*)(framebuffer_device_t *, int)",
-   "referenced_type" : "type-566",
-   "self_type" : "type-565",
+   "referenced_type" : "type-563",
+   "self_type" : "type-562",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16003,8 +16069,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(framebuffer_device_t *, int, int, int, int)",
    "name" : "int (*)(framebuffer_device_t *, int, int, int, int)",
-   "referenced_type" : "type-569",
-   "self_type" : "type-568",
+   "referenced_type" : "type-566",
+   "self_type" : "type-565",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16012,8 +16078,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(hw_device_t *)",
    "name" : "int (*)(hw_device_t *)",
-   "referenced_type" : "type-561",
-   "self_type" : "type-560",
+   "referenced_type" : "type-558",
+   "self_type" : "type-557",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -16021,8 +16087,8 @@
    "alignment" : 4,
    "linker_set_key" : "int (*)(void *)",
    "name" : "int (*)(void *)",
-   "referenced_type" : "type-249",
-   "self_type" : "type-250",
+   "referenced_type" : "type-251",
+   "self_type" : "type-252",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   },
@@ -16030,8 +16096,8 @@
    "alignment" : 4,
    "linker_set_key" : "int *",
    "name" : "int *",
-   "referenced_type" : "type-103",
-   "self_type" : "type-593",
+   "referenced_type" : "type-105",
+   "self_type" : "type-591",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Fence.h"
   },
@@ -16048,8 +16114,8 @@
    "alignment" : 4,
    "linker_set_key" : "long long *",
    "name" : "long long *",
-   "referenced_type" : "type-284",
-   "self_type" : "type-1432",
+   "referenced_type" : "type-12",
+   "self_type" : "type-11",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -16057,7 +16123,7 @@
    "alignment" : 4,
    "linker_set_key" : "native_handle *",
    "name" : "native_handle *",
-   "referenced_type" : "type-144",
+   "referenced_type" : "type-147",
    "self_type" : "type-1132",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
@@ -16066,8 +16132,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned char *",
    "name" : "unsigned char *",
-   "referenced_type" : "type-218",
-   "self_type" : "type-217",
+   "referenced_type" : "type-220",
+   "self_type" : "type-219",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16075,8 +16141,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned int *",
    "name" : "unsigned int *",
-   "referenced_type" : "type-123",
-   "self_type" : "type-122",
+   "referenced_type" : "type-125",
+   "self_type" : "type-124",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -16084,8 +16150,8 @@
    "alignment" : 4,
    "linker_set_key" : "unsigned long long *",
    "name" : "unsigned long long *",
-   "referenced_type" : "type-124",
-   "self_type" : "type-219",
+   "referenced_type" : "type-126",
+   "self_type" : "type-221",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16102,8 +16168,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-221",
-   "self_type" : "type-220",
+   "referenced_type" : "type-223",
+   "self_type" : "type-222",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -16111,8 +16177,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(android_native_base_t *)",
    "name" : "void (*)(android_native_base_t *)",
-   "referenced_type" : "type-521",
-   "self_type" : "type-520",
+   "referenced_type" : "type-519",
+   "self_type" : "type-518",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16120,8 +16186,8 @@
    "alignment" : 4,
    "linker_set_key" : "void (*)(framebuffer_device_t *, char *, int)",
    "name" : "void (*)(framebuffer_device_t *, char *, int)",
-   "referenced_type" : "type-575",
-   "self_type" : "type-574",
+   "referenced_type" : "type-572",
+   "self_type" : "type-571",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h"
   },
@@ -16129,8 +16195,8 @@
    "alignment" : 4,
    "linker_set_key" : "void *",
    "name" : "void *",
-   "referenced_type" : "type-151",
-   "self_type" : "type-227",
+   "referenced_type" : "type-154",
+   "self_type" : "type-229",
    "size" : 4,
    "source_file" : "/system/core/libsystem/include/system/graphics.h"
   },
@@ -16138,8 +16204,8 @@
    "alignment" : 4,
    "linker_set_key" : "void **",
    "name" : "void **",
-   "referenced_type" : "type-227",
-   "self_type" : "type-251",
+   "referenced_type" : "type-229",
+   "self_type" : "type-253",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/AndroidThreads.h"
   }
@@ -16151,8 +16217,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-117",
-   "self_type" : "type-119",
+   "referenced_type" : "type-119",
+   "self_type" : "type-121",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16181,8 +16247,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-13",
-   "self_type" : "type-15",
+   "referenced_type" : "type-1576",
+   "self_type" : "type-1579",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16191,8 +16257,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1572",
-   "self_type" : "type-1574",
+   "referenced_type" : "type-15",
+   "self_type" : "type-37",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16201,8 +16267,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1607",
-   "self_type" : "type-1609",
+   "referenced_type" : "type-1611",
+   "self_type" : "type-1613",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16211,8 +16277,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-174",
-   "self_type" : "type-173",
+   "referenced_type" : "type-177",
+   "self_type" : "type-176",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16221,8 +16287,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1782",
-   "self_type" : "type-1784",
+   "referenced_type" : "type-1783",
+   "self_type" : "type-1785",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16231,8 +16297,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1829",
-   "self_type" : "type-1831",
+   "referenced_type" : "type-1830",
+   "self_type" : "type-1832",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16241,8 +16307,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1834",
-   "self_type" : "type-1836",
+   "referenced_type" : "type-1835",
+   "self_type" : "type-1837",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16251,8 +16317,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1844",
-   "self_type" : "type-1846",
+   "referenced_type" : "type-1845",
+   "self_type" : "type-1847",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16261,8 +16327,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1863",
-   "self_type" : "type-1865",
+   "referenced_type" : "type-1864",
+   "self_type" : "type-1866",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16271,8 +16337,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-1929",
-   "self_type" : "type-1931",
+   "referenced_type" : "type-1930",
+   "self_type" : "type-1932",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16281,8 +16347,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2014",
-   "self_type" : "type-2016",
+   "referenced_type" : "type-2015",
+   "self_type" : "type-2017",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16291,8 +16357,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2166",
-   "self_type" : "type-2168",
+   "referenced_type" : "type-2169",
+   "self_type" : "type-2171",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16301,8 +16367,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2244",
-   "self_type" : "type-2246",
+   "referenced_type" : "type-2246",
+   "self_type" : "type-2248",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16311,8 +16377,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2286",
-   "self_type" : "type-2288",
+   "referenced_type" : "type-2288",
+   "self_type" : "type-2290",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16321,8 +16387,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2337",
-   "self_type" : "type-2339",
+   "referenced_type" : "type-2339",
+   "self_type" : "type-2341",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16331,8 +16397,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2456",
-   "self_type" : "type-2455",
+   "referenced_type" : "type-2458",
+   "self_type" : "type-2457",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16341,8 +16407,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2622",
-   "self_type" : "type-2624",
+   "referenced_type" : "type-2624",
+   "self_type" : "type-2626",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16351,8 +16417,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-2648",
-   "self_type" : "type-2650",
+   "referenced_type" : "type-2650",
+   "self_type" : "type-2652",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16361,8 +16427,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-407",
-   "self_type" : "type-409",
+   "referenced_type" : "type-404",
+   "self_type" : "type-406",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16371,8 +16437,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-513",
-   "self_type" : "type-515",
+   "referenced_type" : "type-510",
+   "self_type" : "type-512",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16381,8 +16447,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-743",
-   "self_type" : "type-745",
+   "referenced_type" : "type-744",
+   "self_type" : "type-746",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16391,8 +16457,8 @@
    "is_const" : true,
    "linker_set_key" : "android::RefBase::weakref_impl *const",
    "name" : "android::RefBase::weakref_impl *const",
-   "referenced_type" : "type-850",
-   "self_type" : "type-852",
+   "referenced_type" : "type-851",
+   "self_type" : "type-853",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
   },
@@ -16421,8 +16487,8 @@
    "is_const" : true,
    "linker_set_key" : "android::hardware::IBinder *const",
    "name" : "android::hardware::IBinder *const",
-   "referenced_type" : "type-195",
-   "self_type" : "type-194",
+   "referenced_type" : "type-208",
+   "self_type" : "type-207",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -16438,32 +16504,32 @@
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-1772",
-   "self_type" : "type-1771",
+   "referenced_type" : "type-1773",
+   "self_type" : "type-1772",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2134",
-   "self_type" : "type-2133",
+   "referenced_type" : "type-2133",
+   "self_type" : "type-2132",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const <type-parameter-0-1>",
    "name" : "const <type-parameter-0-1>",
-   "referenced_type" : "type-2407",
-   "self_type" : "type-2406",
+   "referenced_type" : "type-2409",
+   "self_type" : "type-2408",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const AHardwareBuffer",
    "name" : "const AHardwareBuffer",
-   "referenced_type" : "type-2070",
-   "self_type" : "type-2069",
+   "referenced_type" : "type-2072",
+   "self_type" : "type-2071",
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
   {
@@ -16479,8 +16545,8 @@
    "is_const" : true,
    "linker_set_key" : "const ANativeWindowBuffer",
    "name" : "const ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-637",
+   "referenced_type" : "type-515",
+   "self_type" : "type-638",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h"
   },
@@ -16488,32 +16554,32 @@
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-1763",
-   "self_type" : "type-1762",
+   "referenced_type" : "type-1764",
+   "self_type" : "type-1763",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2047",
-   "self_type" : "type-2046",
+   "referenced_type" : "type-2045",
+   "self_type" : "type-2044",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-2425",
-   "self_type" : "type-2424",
+   "referenced_type" : "type-2427",
+   "self_type" : "type-2426",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const TMat33<T>",
    "name" : "const TMat33<T>",
-   "referenced_type" : "type-962",
-   "self_type" : "type-961",
+   "referenced_type" : "type-959",
+   "self_type" : "type-958",
    "source_file" : "/frameworks/native/libs/math/include/math/mat3.h"
   },
   {
@@ -16521,8 +16587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "const android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
-   "referenced_type" : "type-516",
-   "self_type" : "type-535",
+   "referenced_type" : "type-514",
+   "self_type" : "type-532",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h"
   },
@@ -16542,7 +16608,7 @@
    "linker_set_key" : "const android::ColorSpace::TransferParameters",
    "name" : "const android::ColorSpace::TransferParameters",
    "referenced_type" : "type-981",
-   "self_type" : "type-1033",
+   "self_type" : "type-1030",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -16571,8 +16637,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime",
    "name" : "const android::FenceTime",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1395",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1399",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16581,8 +16647,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot",
    "name" : "const android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1388",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1393",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16591,8 +16657,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::Snapshot::State",
    "name" : "const android::FenceTime::Snapshot::State",
-   "referenced_type" : "type-1384",
-   "self_type" : "type-1406",
+   "referenced_type" : "type-1388",
+   "self_type" : "type-1410",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16601,8 +16667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FenceTime::State",
    "name" : "const android::FenceTime::State",
-   "referenced_type" : "type-1378",
-   "self_type" : "type-1377",
+   "referenced_type" : "type-1383",
+   "self_type" : "type-1382",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -16621,8 +16687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::FrameStats",
    "name" : "const android::FrameStats",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1428",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1432",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h"
   },
@@ -16631,8 +16697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Allocator",
    "name" : "const android::Gralloc2Allocator",
-   "referenced_type" : "type-353",
-   "self_type" : "type-361",
+   "referenced_type" : "type-350",
+   "self_type" : "type-358",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16641,8 +16707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Gralloc2Mapper",
    "name" : "const android::Gralloc2Mapper",
-   "referenced_type" : "type-337",
-   "self_type" : "type-344",
+   "referenced_type" : "type-334",
+   "self_type" : "type-341",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h"
   },
@@ -16651,8 +16717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2060",
-   "self_type" : "type-2059",
+   "referenced_type" : "type-2062",
+   "self_type" : "type-2061",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16661,8 +16727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2226",
-   "self_type" : "type-2225",
+   "referenced_type" : "type-2229",
+   "self_type" : "type-2228",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16671,8 +16737,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-2230",
-   "self_type" : "type-2229",
+   "referenced_type" : "type-2232",
+   "self_type" : "type-2231",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16691,8 +16757,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-803",
-   "self_type" : "type-802",
+   "referenced_type" : "type-804",
+   "self_type" : "type-803",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16701,8 +16767,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GrallocMapper",
    "name" : "const android::GrallocMapper",
-   "referenced_type" : "type-828",
-   "self_type" : "type-827",
+   "referenced_type" : "type-829",
+   "self_type" : "type-828",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16711,8 +16777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBuffer",
    "name" : "const android::GraphicBuffer",
-   "referenced_type" : "type-525",
-   "self_type" : "type-624",
+   "referenced_type" : "type-523",
+   "self_type" : "type-625",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h"
   },
@@ -16721,8 +16787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator",
    "name" : "const android::GraphicBufferAllocator",
-   "referenced_type" : "type-542",
-   "self_type" : "type-720",
+   "referenced_type" : "type-539",
+   "self_type" : "type-721",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h"
   },
@@ -16731,7 +16797,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferAllocator::alloc_rec_t",
    "name" : "const android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
+   "referenced_type" : "type-680",
    "self_type" : "type-706",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -16741,8 +16807,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::GraphicBufferMapper",
    "name" : "const android::GraphicBufferMapper",
-   "referenced_type" : "type-527",
-   "self_type" : "type-614",
+   "referenced_type" : "type-525",
+   "self_type" : "type-615",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h"
   },
@@ -16752,7 +16818,7 @@
    "linker_set_key" : "const android::HdrCapabilities",
    "name" : "const android::HdrCapabilities",
    "referenced_type" : "type-964",
-   "self_type" : "type-972",
+   "self_type" : "type-973",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -16761,8 +16827,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "const android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-715",
-   "self_type" : "type-717",
+   "referenced_type" : "type-716",
+   "self_type" : "type-718",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h"
   },
@@ -16772,7 +16838,7 @@
    "linker_set_key" : "const android::LightFlattenablePod<android::Rect>",
    "name" : "const android::LightFlattenablePod<android::Rect>",
    "referenced_type" : "type-1243",
-   "self_type" : "type-2397",
+   "self_type" : "type-2399",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h"
   },
@@ -16821,7 +16887,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::RefBase",
    "name" : "const android::RefBase",
-   "referenced_type" : "type-172",
+   "referenced_type" : "type-175",
    "self_type" : "type-1078",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h"
@@ -16831,8 +16897,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Region",
    "name" : "const android::Region",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2388",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2390",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h"
   },
@@ -16851,8 +16917,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String16",
    "name" : "const android::String16",
-   "referenced_type" : "type-179",
-   "self_type" : "type-184",
+   "referenced_type" : "type-182",
+   "self_type" : "type-187",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -16861,8 +16927,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::String8",
    "name" : "const android::String8",
-   "referenced_type" : "type-285",
-   "self_type" : "type-873",
+   "referenced_type" : "type-282",
+   "self_type" : "type-863",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -16871,8 +16937,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<android::Rect>",
    "name" : "const android::Vector<android::Rect>",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2384",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2386",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16881,8 +16947,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::Vector<long long>",
    "name" : "const android::Vector<long long>",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1425",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1429",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h"
   },
@@ -16891,8 +16957,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::VectorImpl",
    "name" : "const android::VectorImpl",
-   "referenced_type" : "type-235",
-   "self_type" : "type-1422",
+   "referenced_type" : "type-237",
+   "self_type" : "type-1426",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h"
   },
@@ -16912,7 +16978,7 @@
    "linker_set_key" : "const android::details::TMat33<float>",
    "name" : "const android::details::TMat33<float>",
    "referenced_type" : "type-903",
-   "self_type" : "type-925",
+   "self_type" : "type-919",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -16921,8 +16987,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TMat44<float>",
    "name" : "const android::details::TMat44<float>",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2431",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2433",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h"
   },
@@ -16931,8 +16997,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<double>",
    "name" : "const android::details::TQuaternion<double>",
-   "referenced_type" : "type-331",
-   "self_type" : "type-404",
+   "referenced_type" : "type-328",
+   "self_type" : "type-401",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16941,8 +17007,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TQuaternion<float>",
    "name" : "const android::details::TQuaternion<float>",
-   "referenced_type" : "type-410",
-   "self_type" : "type-432",
+   "referenced_type" : "type-407",
+   "self_type" : "type-429",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h"
   },
@@ -16961,7 +17027,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<double>",
    "name" : "const android::details::TVec2<double>",
-   "referenced_type" : "type-55",
+   "referenced_type" : "type-57",
    "self_type" : "type-1070",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
@@ -16971,7 +17037,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec2<float>",
    "name" : "const android::details::TVec2<float>",
-   "referenced_type" : "type-22",
+   "referenced_type" : "type-23",
    "self_type" : "type-1051",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -16981,7 +17047,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<double>",
    "name" : "const android::details::TVec3<double>",
-   "referenced_type" : "type-66",
+   "referenced_type" : "type-68",
    "self_type" : "type-1369",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h"
@@ -16991,7 +17057,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec3<float>",
    "name" : "const android::details::TVec3<float>",
-   "referenced_type" : "type-17",
+   "referenced_type" : "type-18",
    "self_type" : "type-1055",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
@@ -17001,8 +17067,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<double>",
    "name" : "const android::details::TVec4<double>",
-   "referenced_type" : "type-50",
-   "self_type" : "type-166",
+   "referenced_type" : "type-52",
+   "self_type" : "type-164",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17011,8 +17077,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::details::TVec4<float>",
    "name" : "const android::details::TVec4<float>",
-   "referenced_type" : "type-200",
-   "self_type" : "type-325",
+   "referenced_type" : "type-192",
+   "self_type" : "type-322",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h"
   },
@@ -17022,7 +17088,7 @@
    "linker_set_key" : "const android::half",
    "name" : "const android::half",
    "referenced_type" : "type-1",
-   "self_type" : "type-42",
+   "self_type" : "type-44",
    "size" : 2,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17051,8 +17117,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::BpHwRefBase",
    "name" : "const android::hardware::BpHwRefBase",
-   "referenced_type" : "type-193",
-   "self_type" : "type-211",
+   "referenced_type" : "type-206",
+   "self_type" : "type-213",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h"
   },
@@ -17061,8 +17127,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Parcel",
    "name" : "const android::hardware::Parcel",
-   "referenced_type" : "type-215",
-   "self_type" : "type-231",
+   "referenced_type" : "type-217",
+   "self_type" : "type-233",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h"
   },
@@ -17071,8 +17137,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
-   "referenced_type" : "type-99",
-   "self_type" : "type-109",
+   "referenced_type" : "type-101",
+   "self_type" : "type-111",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17081,8 +17147,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "const android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
-   "referenced_type" : "type-393",
-   "self_type" : "type-401",
+   "referenced_type" : "type-392",
+   "self_type" : "type-398",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17091,8 +17157,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "const android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
-   "referenced_type" : "type-111",
-   "self_type" : "type-115",
+   "referenced_type" : "type-113",
+   "self_type" : "type-117",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -17101,7 +17167,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::Status",
    "name" : "const android::hardware::Status",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1310",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17121,8 +17187,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "const android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-293",
+   "referenced_type" : "type-139",
+   "self_type" : "type-290",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17131,8 +17197,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "const android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-190",
+   "referenced_type" : "type-122",
+   "self_type" : "type-203",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -17141,7 +17207,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::details::return_status",
    "name" : "const android::hardware::details::return_status",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1319",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -17151,8 +17217,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1745",
-   "self_type" : "type-1744",
+   "referenced_type" : "type-1746",
+   "self_type" : "type-1745",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17161,8 +17227,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-1911",
-   "self_type" : "type-1910",
+   "referenced_type" : "type-1913",
+   "self_type" : "type-1912",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17171,8 +17237,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V2_0::IAllocator",
-   "referenced_type" : "type-382",
-   "self_type" : "type-381",
+   "referenced_type" : "type-379",
+   "self_type" : "type-378",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17181,8 +17247,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-2004",
-   "self_type" : "type-2003",
+   "referenced_type" : "type-2005",
+   "self_type" : "type-2004",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17191,8 +17257,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
    "name" : "const android::hardware::graphics::allocator::V3_0::IAllocator",
-   "referenced_type" : "type-495",
-   "self_type" : "type-494",
+   "referenced_type" : "type-492",
+   "self_type" : "type-491",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17201,8 +17267,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_0::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_0::BufferUsage",
-   "referenced_type" : "type-150",
-   "self_type" : "type-153",
+   "referenced_type" : "type-153",
+   "self_type" : "type-156",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -17271,8 +17337,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_1::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_1::BufferUsage",
-   "referenced_type" : "type-158",
-   "self_type" : "type-160",
+   "referenced_type" : "type-160",
+   "self_type" : "type-162",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -17321,8 +17387,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::common::V1_2::BufferUsage",
    "name" : "const android::hardware::graphics::common::V1_2::BufferUsage",
-   "referenced_type" : "type-420",
-   "self_type" : "type-422",
+   "referenced_type" : "type-417",
+   "self_type" : "type-419",
    "size" : 8,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -17371,8 +17437,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1585",
-   "self_type" : "type-1584",
+   "referenced_type" : "type-1589",
+   "self_type" : "type-1588",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17381,8 +17447,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-1857",
-   "self_type" : "type-1856",
+   "referenced_type" : "type-1858",
+   "self_type" : "type-1857",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17391,8 +17457,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_0::IMapper",
-   "referenced_type" : "type-85",
-   "self_type" : "type-84",
+   "referenced_type" : "type-87",
+   "self_type" : "type-86",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17401,8 +17467,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1595",
-   "self_type" : "type-1594",
+   "referenced_type" : "type-1599",
+   "self_type" : "type-1598",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17411,8 +17477,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-1861",
-   "self_type" : "type-1860",
+   "referenced_type" : "type-1862",
+   "self_type" : "type-1861",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17421,8 +17487,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V2_1::IMapper",
    "name" : "const android::hardware::graphics::mapper::V2_1::IMapper",
-   "referenced_type" : "type-97",
-   "self_type" : "type-96",
+   "referenced_type" : "type-99",
+   "self_type" : "type-98",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17431,8 +17497,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-1919",
-   "self_type" : "type-1918",
+   "referenced_type" : "type-1920",
+   "self_type" : "type-1919",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17441,8 +17507,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::graphics::mapper::V3_0::IMapper",
    "name" : "const android::hardware::graphics::mapper::V3_0::IMapper",
-   "referenced_type" : "type-392",
-   "self_type" : "type-391",
+   "referenced_type" : "type-389",
+   "self_type" : "type-388",
    "size" : 12,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17461,8 +17527,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-154",
+   "referenced_type" : "type-152",
+   "self_type" : "type-157",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17471,8 +17537,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-161",
+   "referenced_type" : "type-159",
+   "self_type" : "type-163",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17481,8 +17547,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "const android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-423",
+   "referenced_type" : "type-416",
+   "self_type" : "type-420",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17491,7 +17557,7 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_handle",
    "name" : "const android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1121",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -17521,8 +17587,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "const android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-146",
+   "referenced_type" : "type-138",
+   "self_type" : "type-149",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17531,8 +17597,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hardware::hidl_vec<unsigned int>",
    "name" : "const android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-132",
+   "referenced_type" : "type-131",
+   "self_type" : "type-134",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -17551,8 +17617,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-164",
-   "self_type" : "type-165",
+   "referenced_type" : "type-167",
+   "self_type" : "type-168",
    "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"
   },
@@ -17561,8 +17627,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::hidl::base::V1_0::IBase",
    "name" : "const android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-170",
+   "referenced_type" : "type-174",
+   "self_type" : "type-173",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h"
   },
@@ -17571,8 +17637,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-295",
-   "self_type" : "type-294",
+   "referenced_type" : "type-292",
+   "self_type" : "type-291",
    "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"
   },
@@ -17601,8 +17667,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::IBinder>",
    "name" : "const android::sp<android::hardware::IBinder>",
-   "referenced_type" : "type-248",
-   "self_type" : "type-273",
+   "referenced_type" : "type-250",
+   "self_type" : "type-269",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   },
@@ -17611,8 +17677,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::ProcessState>",
    "name" : "const android::sp<android::hardware::ProcessState>",
-   "referenced_type" : "type-279",
-   "self_type" : "type-278",
+   "referenced_type" : "type-275",
+   "self_type" : "type-274",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h"
   },
@@ -17621,8 +17687,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
-   "referenced_type" : "type-355",
-   "self_type" : "type-379",
+   "referenced_type" : "type-352",
+   "self_type" : "type-376",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17631,8 +17697,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "const android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
-   "referenced_type" : "type-484",
-   "self_type" : "type-492",
+   "referenced_type" : "type-481",
+   "self_type" : "type-489",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17641,8 +17707,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
-   "referenced_type" : "type-338",
-   "self_type" : "type-387",
+   "referenced_type" : "type-335",
+   "self_type" : "type-384",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17651,8 +17717,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
-   "referenced_type" : "type-86",
-   "self_type" : "type-91",
+   "referenced_type" : "type-88",
+   "self_type" : "type-93",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17661,8 +17727,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "const android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
-   "referenced_type" : "type-497",
-   "self_type" : "type-505",
+   "referenced_type" : "type-494",
+   "self_type" : "type-502",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17681,8 +17747,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-363",
-   "self_type" : "type-365",
+   "referenced_type" : "type-360",
+   "self_type" : "type-362",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17691,8 +17757,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-371",
-   "self_type" : "type-374",
+   "referenced_type" : "type-368",
+   "self_type" : "type-371",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -17711,8 +17777,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform",
    "name" : "const android::ui::Transform",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2437",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2439",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17721,8 +17787,8 @@
    "is_const" : true,
    "linker_set_key" : "const android::ui::Transform::mat33",
    "name" : "const android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2445",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2447",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h"
   },
@@ -17732,7 +17798,7 @@
    "linker_set_key" : "const bool",
    "name" : "const bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-370",
+   "self_type" : "type-367",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17741,8 +17807,8 @@
    "is_const" : true,
    "linker_set_key" : "const char",
    "name" : "const char",
-   "referenced_type" : "type-288",
-   "self_type" : "type-287",
+   "referenced_type" : "type-285",
+   "self_type" : "type-284",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h"
   },
@@ -17751,8 +17817,8 @@
    "is_const" : true,
    "linker_set_key" : "const char16_t",
    "name" : "const char16_t",
-   "referenced_type" : "type-182",
-   "self_type" : "type-181",
+   "referenced_type" : "type-185",
+   "self_type" : "type-184",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/String16.h"
   },
@@ -17761,8 +17827,8 @@
    "is_const" : true,
    "linker_set_key" : "const double",
    "name" : "const double",
-   "referenced_type" : "type-41",
-   "self_type" : "type-853",
+   "referenced_type" : "type-43",
+   "self_type" : "type-850",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -17772,7 +17838,7 @@
    "linker_set_key" : "const float",
    "name" : "const float",
    "referenced_type" : "type-10",
-   "self_type" : "type-563",
+   "self_type" : "type-560",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -17788,24 +17854,24 @@
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-1775",
-   "self_type" : "type-1774",
+   "referenced_type" : "type-1776",
+   "self_type" : "type-1775",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2210",
-   "self_type" : "type-2209",
+   "referenced_type" : "type-2208",
+   "self_type" : "type-2207",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
    "name" : "const function<type-parameter-0-1 (type-parameter-0-1)>",
-   "referenced_type" : "type-2413",
-   "self_type" : "type-2412",
+   "referenced_type" : "type-2415",
+   "self_type" : "type-2414",
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
   {
@@ -17813,8 +17879,8 @@
    "is_const" : true,
    "linker_set_key" : "const gralloc_module_t",
    "name" : "const gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-582",
+   "referenced_type" : "type-576",
+   "self_type" : "type-580",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h"
   },
@@ -17823,8 +17889,8 @@
    "is_const" : true,
    "linker_set_key" : "const hw_module_t",
    "name" : "const hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-555",
+   "referenced_type" : "type-546",
+   "self_type" : "type-552",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h"
   },
@@ -17833,8 +17899,8 @@
    "is_const" : true,
    "linker_set_key" : "const int",
    "name" : "const int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-562",
+   "referenced_type" : "type-105",
+   "self_type" : "type-559",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -17850,120 +17916,120 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-126",
-   "self_type" : "type-125",
+   "referenced_type" : "type-129",
+   "self_type" : "type-128",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1577",
-   "self_type" : "type-1576",
+   "referenced_type" : "type-1581",
+   "self_type" : "type-1580",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1612",
-   "self_type" : "type-1611",
+   "referenced_type" : "type-1617",
+   "self_type" : "type-1616",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1787",
-   "self_type" : "type-1786",
+   "referenced_type" : "type-1788",
+   "self_type" : "type-1787",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1848",
-   "self_type" : "type-1847",
+   "referenced_type" : "type-1849",
+   "self_type" : "type-1848",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1867",
-   "self_type" : "type-1866",
+   "referenced_type" : "type-1868",
+   "self_type" : "type-1867",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-1934",
-   "self_type" : "type-1933",
+   "referenced_type" : "type-1936",
+   "self_type" : "type-1935",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2080",
-   "self_type" : "type-2079",
+   "referenced_type" : "type-2082",
+   "self_type" : "type-2081",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2171",
-   "self_type" : "type-2170",
+   "referenced_type" : "type-2174",
+   "self_type" : "type-2173",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2248",
-   "self_type" : "type-2247",
+   "referenced_type" : "type-2250",
+   "self_type" : "type-2249",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2290",
-   "self_type" : "type-2289",
+   "referenced_type" : "type-2292",
+   "self_type" : "type-2291",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2341",
-   "self_type" : "type-2340",
+   "referenced_type" : "type-2343",
+   "self_type" : "type-2342",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-2472",
-   "self_type" : "type-2471",
+   "referenced_type" : "type-2474",
+   "self_type" : "type-2473",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-37",
-   "self_type" : "type-36",
+   "referenced_type" : "type-40",
+   "self_type" : "type-39",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-417",
-   "self_type" : "type-416",
+   "referenced_type" : "type-414",
+   "self_type" : "type-413",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -17978,16 +18044,16 @@
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-748",
-   "self_type" : "type-747",
+   "referenced_type" : "type-749",
+   "self_type" : "type-748",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
    "is_const" : true,
    "linker_set_key" : "const iter<is_const>",
    "name" : "const iter<is_const>",
-   "referenced_type" : "type-855",
-   "self_type" : "type-854",
+   "referenced_type" : "type-857",
+   "self_type" : "type-856",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
   {
@@ -18021,7 +18087,7 @@
    "is_const" : true,
    "linker_set_key" : "const long long",
    "name" : "const long long",
-   "referenced_type" : "type-284",
+   "referenced_type" : "type-12",
    "self_type" : "type-847",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
@@ -18031,8 +18097,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle",
    "name" : "const native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-143",
+   "referenced_type" : "type-147",
+   "self_type" : "type-146",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -18041,8 +18107,8 @@
    "is_const" : true,
    "linker_set_key" : "const native_handle *const",
    "name" : "const native_handle *const",
-   "referenced_type" : "type-142",
-   "self_type" : "type-696",
+   "referenced_type" : "type-145",
+   "self_type" : "type-699",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18052,7 +18118,7 @@
    "linker_set_key" : "const short",
    "name" : "const short",
    "referenced_type" : "type-599",
-   "self_type" : "type-825",
+   "self_type" : "type-823",
    "size" : 2,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -18081,8 +18147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-1769",
-   "self_type" : "type-1768",
+   "referenced_type" : "type-1770",
+   "self_type" : "type-1769",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18091,8 +18157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::details::TVec2<float>, 3>",
    "name" : "const std::array<android::details::TVec2<float>, 3>",
-   "referenced_type" : "type-2122",
-   "self_type" : "type-2121",
+   "referenced_type" : "type-2120",
+   "self_type" : "type-2119",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -18111,8 +18177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1687",
-   "self_type" : "type-1686",
+   "referenced_type" : "type-1688",
+   "self_type" : "type-1687",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18121,8 +18187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1793",
-   "self_type" : "type-1792",
+   "referenced_type" : "type-1794",
+   "self_type" : "type-1793",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18131,8 +18197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1880",
-   "self_type" : "type-1879",
+   "referenced_type" : "type-1881",
+   "self_type" : "type-1880",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18141,8 +18207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-1956",
-   "self_type" : "type-1955",
+   "referenced_type" : "type-1958",
+   "self_type" : "type-1957",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18151,8 +18217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2087",
-   "self_type" : "type-2086",
+   "referenced_type" : "type-2090",
+   "self_type" : "type-2089",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18161,8 +18227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2185",
-   "self_type" : "type-2184",
+   "referenced_type" : "type-2188",
+   "self_type" : "type-2187",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18171,8 +18237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2255",
-   "self_type" : "type-2254",
+   "referenced_type" : "type-2257",
+   "self_type" : "type-2256",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18181,8 +18247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2295",
-   "self_type" : "type-2294",
+   "referenced_type" : "type-2297",
+   "self_type" : "type-2296",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18191,8 +18257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2346",
-   "self_type" : "type-2345",
+   "referenced_type" : "type-2348",
+   "self_type" : "type-2347",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18201,8 +18267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-2510",
-   "self_type" : "type-2509",
+   "referenced_type" : "type-2512",
+   "self_type" : "type-2511",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18211,8 +18277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-302",
-   "self_type" : "type-301",
+   "referenced_type" : "type-299",
+   "self_type" : "type-298",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18221,8 +18287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-442",
-   "self_type" : "type-441",
+   "referenced_type" : "type-439",
+   "self_type" : "type-438",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18241,8 +18307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-762",
-   "self_type" : "type-761",
+   "referenced_type" : "type-764",
+   "self_type" : "type-763",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18251,8 +18317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-866",
-   "self_type" : "type-865",
+   "referenced_type" : "type-867",
+   "self_type" : "type-866",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18261,8 +18327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::BufferUsage, 23>",
-   "referenced_type" : "type-922",
-   "self_type" : "type-921",
+   "referenced_type" : "type-923",
+   "self_type" : "type-922",
    "size" : 184,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18281,8 +18347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1001",
-   "self_type" : "type-1000",
+   "referenced_type" : "type-1002",
+   "self_type" : "type-1001",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18301,8 +18367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1693",
-   "self_type" : "type-1692",
+   "referenced_type" : "type-1694",
+   "self_type" : "type-1693",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18311,8 +18377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1799",
-   "self_type" : "type-1798",
+   "referenced_type" : "type-1800",
+   "self_type" : "type-1799",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18321,8 +18387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1886",
-   "self_type" : "type-1885",
+   "referenced_type" : "type-1887",
+   "self_type" : "type-1886",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18331,8 +18397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-1963",
-   "self_type" : "type-1962",
+   "referenced_type" : "type-1964",
+   "self_type" : "type-1963",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18341,8 +18407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2093",
-   "self_type" : "type-2092",
+   "referenced_type" : "type-2096",
+   "self_type" : "type-2095",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18351,8 +18417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2192",
-   "self_type" : "type-2191",
+   "referenced_type" : "type-2195",
+   "self_type" : "type-2194",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18361,8 +18427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2261",
-   "self_type" : "type-2260",
+   "referenced_type" : "type-2263",
+   "self_type" : "type-2262",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18371,8 +18437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2301",
-   "self_type" : "type-2300",
+   "referenced_type" : "type-2303",
+   "self_type" : "type-2302",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18381,8 +18447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2352",
-   "self_type" : "type-2351",
+   "referenced_type" : "type-2354",
+   "self_type" : "type-2353",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18391,8 +18457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-2516",
-   "self_type" : "type-2515",
+   "referenced_type" : "type-2518",
+   "self_type" : "type-2517",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18401,8 +18467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-308",
-   "self_type" : "type-307",
+   "referenced_type" : "type-306",
+   "self_type" : "type-305",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18411,8 +18477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-448",
-   "self_type" : "type-447",
+   "referenced_type" : "type-445",
+   "self_type" : "type-444",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18421,8 +18487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-658",
-   "self_type" : "type-657",
+   "referenced_type" : "type-659",
+   "self_type" : "type-658",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18441,8 +18507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-872",
-   "self_type" : "type-871",
+   "referenced_type" : "type-873",
+   "self_type" : "type-872",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18451,8 +18517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorMode, 10>",
-   "referenced_type" : "type-929",
-   "self_type" : "type-928",
+   "referenced_type" : "type-930",
+   "self_type" : "type-929",
    "size" : 40,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18461,8 +18527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1003",
-   "self_type" : "type-1002",
+   "referenced_type" : "type-1004",
+   "self_type" : "type-1003",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18481,8 +18547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1695",
-   "self_type" : "type-1694",
+   "referenced_type" : "type-1696",
+   "self_type" : "type-1695",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18491,8 +18557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1801",
-   "self_type" : "type-1800",
+   "referenced_type" : "type-1802",
+   "self_type" : "type-1801",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18501,8 +18567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1888",
-   "self_type" : "type-1887",
+   "referenced_type" : "type-1889",
+   "self_type" : "type-1888",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18511,8 +18577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-1965",
-   "self_type" : "type-1964",
+   "referenced_type" : "type-1967",
+   "self_type" : "type-1966",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18521,8 +18587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2095",
-   "self_type" : "type-2094",
+   "referenced_type" : "type-2098",
+   "self_type" : "type-2097",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18531,8 +18597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2194",
-   "self_type" : "type-2193",
+   "referenced_type" : "type-2197",
+   "self_type" : "type-2196",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18541,8 +18607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2263",
-   "self_type" : "type-2262",
+   "referenced_type" : "type-2265",
+   "self_type" : "type-2264",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18551,8 +18617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2303",
-   "self_type" : "type-2302",
+   "referenced_type" : "type-2305",
+   "self_type" : "type-2304",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18561,8 +18627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2354",
-   "self_type" : "type-2353",
+   "referenced_type" : "type-2356",
+   "self_type" : "type-2355",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18571,8 +18637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-2518",
-   "self_type" : "type-2517",
+   "referenced_type" : "type-2520",
+   "self_type" : "type-2519",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18581,8 +18647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-311",
-   "self_type" : "type-310",
+   "referenced_type" : "type-308",
+   "self_type" : "type-307",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18591,8 +18657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-450",
-   "self_type" : "type-449",
+   "referenced_type" : "type-447",
+   "self_type" : "type-446",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18601,8 +18667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-660",
-   "self_type" : "type-659",
+   "referenced_type" : "type-661",
+   "self_type" : "type-660",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18621,8 +18687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-875",
-   "self_type" : "type-874",
+   "referenced_type" : "type-876",
+   "self_type" : "type-875",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18631,8 +18697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::ColorTransform, 7>",
-   "referenced_type" : "type-931",
-   "self_type" : "type-930",
+   "referenced_type" : "type-932",
+   "self_type" : "type-931",
    "size" : 28,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18651,8 +18717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1691",
-   "self_type" : "type-1690",
+   "referenced_type" : "type-1692",
+   "self_type" : "type-1691",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18661,8 +18727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1797",
-   "self_type" : "type-1796",
+   "referenced_type" : "type-1798",
+   "self_type" : "type-1797",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18671,8 +18737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1884",
-   "self_type" : "type-1883",
+   "referenced_type" : "type-1885",
+   "self_type" : "type-1884",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18681,8 +18747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-1961",
-   "self_type" : "type-1960",
+   "referenced_type" : "type-1962",
+   "self_type" : "type-1961",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18691,8 +18757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2091",
-   "self_type" : "type-2090",
+   "referenced_type" : "type-2094",
+   "self_type" : "type-2093",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18701,8 +18767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2189",
-   "self_type" : "type-2188",
+   "referenced_type" : "type-2192",
+   "self_type" : "type-2191",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18711,8 +18777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2259",
-   "self_type" : "type-2258",
+   "referenced_type" : "type-2261",
+   "self_type" : "type-2260",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18721,8 +18787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2299",
-   "self_type" : "type-2298",
+   "referenced_type" : "type-2301",
+   "self_type" : "type-2300",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18731,8 +18797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2350",
-   "self_type" : "type-2349",
+   "referenced_type" : "type-2352",
+   "self_type" : "type-2351",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18741,8 +18807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-2514",
-   "self_type" : "type-2513",
+   "referenced_type" : "type-2516",
+   "self_type" : "type-2515",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18751,8 +18817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-306",
-   "self_type" : "type-305",
+   "referenced_type" : "type-303",
+   "self_type" : "type-302",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18761,8 +18827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-446",
-   "self_type" : "type-445",
+   "referenced_type" : "type-443",
+   "self_type" : "type-442",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18771,8 +18837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-656",
-   "self_type" : "type-655",
+   "referenced_type" : "type-657",
+   "self_type" : "type-656",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18781,8 +18847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-766",
-   "self_type" : "type-765",
+   "referenced_type" : "type-768",
+   "self_type" : "type-767",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18791,8 +18857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-870",
-   "self_type" : "type-869",
+   "referenced_type" : "type-871",
+   "self_type" : "type-870",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18801,8 +18867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Dataspace, 57>",
-   "referenced_type" : "type-927",
-   "self_type" : "type-926",
+   "referenced_type" : "type-928",
+   "self_type" : "type-927",
    "size" : 228,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18821,8 +18887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1005",
-   "self_type" : "type-1004",
+   "referenced_type" : "type-1006",
+   "self_type" : "type-1005",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18841,8 +18907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1697",
-   "self_type" : "type-1696",
+   "referenced_type" : "type-1698",
+   "self_type" : "type-1697",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18851,8 +18917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1803",
-   "self_type" : "type-1802",
+   "referenced_type" : "type-1804",
+   "self_type" : "type-1803",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18861,8 +18927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1890",
-   "self_type" : "type-1889",
+   "referenced_type" : "type-1891",
+   "self_type" : "type-1890",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18871,8 +18937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-1967",
-   "self_type" : "type-1966",
+   "referenced_type" : "type-1969",
+   "self_type" : "type-1968",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18881,8 +18947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2098",
-   "self_type" : "type-2097",
+   "referenced_type" : "type-2102",
+   "self_type" : "type-2101",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18891,8 +18957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2196",
-   "self_type" : "type-2195",
+   "referenced_type" : "type-2199",
+   "self_type" : "type-2198",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18901,8 +18967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2265",
-   "self_type" : "type-2264",
+   "referenced_type" : "type-2267",
+   "self_type" : "type-2266",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18911,8 +18977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2305",
-   "self_type" : "type-2304",
+   "referenced_type" : "type-2307",
+   "self_type" : "type-2306",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18921,8 +18987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2356",
-   "self_type" : "type-2355",
+   "referenced_type" : "type-2358",
+   "self_type" : "type-2357",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18931,8 +18997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-2520",
-   "self_type" : "type-2519",
+   "referenced_type" : "type-2522",
+   "self_type" : "type-2521",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18941,8 +19007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-313",
-   "self_type" : "type-312",
+   "referenced_type" : "type-310",
+   "self_type" : "type-309",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18951,8 +19017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-452",
-   "self_type" : "type-451",
+   "referenced_type" : "type-449",
+   "self_type" : "type-448",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18981,8 +19047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-877",
-   "self_type" : "type-876",
+   "referenced_type" : "type-878",
+   "self_type" : "type-877",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -18991,8 +19057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Hdr, 3>",
-   "referenced_type" : "type-933",
-   "self_type" : "type-932",
+   "referenced_type" : "type-934",
+   "self_type" : "type-933",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19011,8 +19077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1685",
-   "self_type" : "type-1684",
+   "referenced_type" : "type-1686",
+   "self_type" : "type-1685",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19021,8 +19087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1791",
-   "self_type" : "type-1790",
+   "referenced_type" : "type-1792",
+   "self_type" : "type-1791",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19031,8 +19097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1878",
-   "self_type" : "type-1877",
+   "referenced_type" : "type-1879",
+   "self_type" : "type-1878",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19041,8 +19107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-1954",
-   "self_type" : "type-1953",
+   "referenced_type" : "type-1955",
+   "self_type" : "type-1954",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19051,8 +19117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2085",
-   "self_type" : "type-2084",
+   "referenced_type" : "type-2087",
+   "self_type" : "type-2086",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19061,8 +19127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2183",
-   "self_type" : "type-2182",
+   "referenced_type" : "type-2186",
+   "self_type" : "type-2185",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19071,8 +19137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2253",
-   "self_type" : "type-2252",
+   "referenced_type" : "type-2255",
+   "self_type" : "type-2254",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19081,8 +19147,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2293",
-   "self_type" : "type-2292",
+   "referenced_type" : "type-2295",
+   "self_type" : "type-2294",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19091,8 +19157,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2344",
-   "self_type" : "type-2343",
+   "referenced_type" : "type-2346",
+   "self_type" : "type-2345",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19101,8 +19167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-2508",
-   "self_type" : "type-2507",
+   "referenced_type" : "type-2510",
+   "self_type" : "type-2509",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19111,8 +19177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-300",
-   "self_type" : "type-299",
+   "referenced_type" : "type-297",
+   "self_type" : "type-296",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19121,8 +19187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-440",
-   "self_type" : "type-439",
+   "referenced_type" : "type-437",
+   "self_type" : "type-436",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19131,8 +19197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-649",
-   "self_type" : "type-648",
+   "referenced_type" : "type-650",
+   "self_type" : "type-649",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19151,8 +19217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-863",
-   "self_type" : "type-862",
+   "referenced_type" : "type-865",
+   "self_type" : "type-864",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19161,8 +19227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::PixelFormat, 20>",
-   "referenced_type" : "type-920",
-   "self_type" : "type-919",
+   "referenced_type" : "type-921",
+   "self_type" : "type-920",
    "size" : 80,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19191,8 +19257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1689",
-   "self_type" : "type-1688",
+   "referenced_type" : "type-1690",
+   "self_type" : "type-1689",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19201,8 +19267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1795",
-   "self_type" : "type-1794",
+   "referenced_type" : "type-1796",
+   "self_type" : "type-1795",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19211,8 +19277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1882",
-   "self_type" : "type-1881",
+   "referenced_type" : "type-1883",
+   "self_type" : "type-1882",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19221,8 +19287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-1958",
-   "self_type" : "type-1957",
+   "referenced_type" : "type-1960",
+   "self_type" : "type-1959",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19231,8 +19297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2089",
-   "self_type" : "type-2088",
+   "referenced_type" : "type-2092",
+   "self_type" : "type-2091",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19241,8 +19307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2187",
-   "self_type" : "type-2186",
+   "referenced_type" : "type-2190",
+   "self_type" : "type-2189",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19251,8 +19317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2257",
-   "self_type" : "type-2256",
+   "referenced_type" : "type-2259",
+   "self_type" : "type-2258",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19261,8 +19327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2297",
-   "self_type" : "type-2296",
+   "referenced_type" : "type-2299",
+   "self_type" : "type-2298",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19271,8 +19337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2348",
-   "self_type" : "type-2347",
+   "referenced_type" : "type-2350",
+   "self_type" : "type-2349",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19281,8 +19347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-2512",
-   "self_type" : "type-2511",
+   "referenced_type" : "type-2514",
+   "self_type" : "type-2513",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19291,8 +19357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-304",
-   "self_type" : "type-303",
+   "referenced_type" : "type-301",
+   "self_type" : "type-300",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19301,8 +19367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-444",
-   "self_type" : "type-443",
+   "referenced_type" : "type-441",
+   "self_type" : "type-440",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19321,8 +19387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-764",
-   "self_type" : "type-763",
+   "referenced_type" : "type-766",
+   "self_type" : "type-765",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19331,8 +19397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-868",
-   "self_type" : "type-867",
+   "referenced_type" : "type-869",
+   "self_type" : "type-868",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19341,8 +19407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
    "name" : "const std::array<android::hardware::graphics::common::V1_0::Transform, 5>",
-   "referenced_type" : "type-924",
-   "self_type" : "type-923",
+   "referenced_type" : "type-925",
+   "self_type" : "type-924",
    "size" : 20,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.0/android.hardware.graphics.common@1.0_genc++_headers/gen/android/hardware/graphics/common/1.0/types.h"
   },
@@ -19361,8 +19427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1010",
-   "self_type" : "type-1009",
+   "referenced_type" : "type-1012",
+   "self_type" : "type-1011",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19381,8 +19447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1702",
-   "self_type" : "type-1701",
+   "referenced_type" : "type-1703",
+   "self_type" : "type-1702",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19391,8 +19457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1807",
-   "self_type" : "type-1806",
+   "referenced_type" : "type-1808",
+   "self_type" : "type-1807",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19401,8 +19467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1894",
-   "self_type" : "type-1893",
+   "referenced_type" : "type-1895",
+   "self_type" : "type-1894",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19411,8 +19477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-1972",
-   "self_type" : "type-1971",
+   "referenced_type" : "type-1974",
+   "self_type" : "type-1973",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19421,8 +19487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2102",
-   "self_type" : "type-2101",
+   "referenced_type" : "type-2106",
+   "self_type" : "type-2105",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19431,8 +19497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2201",
-   "self_type" : "type-2200",
+   "referenced_type" : "type-2204",
+   "self_type" : "type-2203",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19441,8 +19507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2269",
-   "self_type" : "type-2268",
+   "referenced_type" : "type-2271",
+   "self_type" : "type-2270",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19451,8 +19517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2309",
-   "self_type" : "type-2308",
+   "referenced_type" : "type-2311",
+   "self_type" : "type-2310",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19461,8 +19527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2360",
-   "self_type" : "type-2359",
+   "referenced_type" : "type-2362",
+   "self_type" : "type-2361",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19471,8 +19537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-2528",
-   "self_type" : "type-2527",
+   "referenced_type" : "type-2530",
+   "self_type" : "type-2529",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19481,8 +19547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-318",
-   "self_type" : "type-317",
+   "referenced_type" : "type-315",
+   "self_type" : "type-314",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19491,8 +19557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-457",
-   "self_type" : "type-456",
+   "referenced_type" : "type-454",
+   "self_type" : "type-453",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19501,8 +19567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-667",
-   "self_type" : "type-666",
+   "referenced_type" : "type-668",
+   "self_type" : "type-667",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19511,8 +19577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-778",
-   "self_type" : "type-777",
+   "referenced_type" : "type-779",
+   "self_type" : "type-778",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19521,8 +19587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-882",
-   "self_type" : "type-881",
+   "referenced_type" : "type-883",
+   "self_type" : "type-882",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19531,8 +19597,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::BufferUsage, 25>",
-   "referenced_type" : "type-938",
-   "self_type" : "type-937",
+   "referenced_type" : "type-939",
+   "self_type" : "type-938",
    "size" : 200,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19541,8 +19607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1014",
-   "self_type" : "type-1013",
+   "referenced_type" : "type-1016",
+   "self_type" : "type-1015",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19561,8 +19627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1706",
-   "self_type" : "type-1705",
+   "referenced_type" : "type-1707",
+   "self_type" : "type-1706",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19571,8 +19637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1811",
-   "self_type" : "type-1810",
+   "referenced_type" : "type-1812",
+   "self_type" : "type-1811",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19581,8 +19647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1898",
-   "self_type" : "type-1897",
+   "referenced_type" : "type-1899",
+   "self_type" : "type-1898",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19591,8 +19657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-1976",
-   "self_type" : "type-1975",
+   "referenced_type" : "type-1978",
+   "self_type" : "type-1977",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19601,8 +19667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2108",
-   "self_type" : "type-2107",
+   "referenced_type" : "type-2110",
+   "self_type" : "type-2109",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19611,8 +19677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2206",
-   "self_type" : "type-2205",
+   "referenced_type" : "type-2210",
+   "self_type" : "type-2209",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19621,8 +19687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2273",
-   "self_type" : "type-2272",
+   "referenced_type" : "type-2275",
+   "self_type" : "type-2274",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19631,8 +19697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2313",
-   "self_type" : "type-2312",
+   "referenced_type" : "type-2315",
+   "self_type" : "type-2314",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19641,8 +19707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2364",
-   "self_type" : "type-2363",
+   "referenced_type" : "type-2366",
+   "self_type" : "type-2365",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19651,8 +19717,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-2532",
-   "self_type" : "type-2531",
+   "referenced_type" : "type-2534",
+   "self_type" : "type-2533",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19661,8 +19727,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-322",
-   "self_type" : "type-321",
+   "referenced_type" : "type-319",
+   "self_type" : "type-318",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19671,8 +19737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-461",
-   "self_type" : "type-460",
+   "referenced_type" : "type-459",
+   "self_type" : "type-458",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19681,8 +19747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-672",
-   "self_type" : "type-671",
+   "referenced_type" : "type-673",
+   "self_type" : "type-672",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19701,8 +19767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-886",
-   "self_type" : "type-885",
+   "referenced_type" : "type-887",
+   "self_type" : "type-886",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19711,8 +19777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::ColorMode, 13>",
-   "referenced_type" : "type-943",
-   "self_type" : "type-942",
+   "referenced_type" : "type-944",
+   "self_type" : "type-943",
    "size" : 52,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19721,8 +19787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1012",
-   "self_type" : "type-1011",
+   "referenced_type" : "type-1014",
+   "self_type" : "type-1013",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19741,8 +19807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1704",
-   "self_type" : "type-1703",
+   "referenced_type" : "type-1705",
+   "self_type" : "type-1704",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19751,8 +19817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1809",
-   "self_type" : "type-1808",
+   "referenced_type" : "type-1810",
+   "self_type" : "type-1809",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19761,8 +19827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1896",
-   "self_type" : "type-1895",
+   "referenced_type" : "type-1897",
+   "self_type" : "type-1896",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19771,8 +19837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-1974",
-   "self_type" : "type-1973",
+   "referenced_type" : "type-1976",
+   "self_type" : "type-1975",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19781,8 +19847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2106",
-   "self_type" : "type-2105",
+   "referenced_type" : "type-2108",
+   "self_type" : "type-2107",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19791,8 +19857,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2203",
-   "self_type" : "type-2202",
+   "referenced_type" : "type-2206",
+   "self_type" : "type-2205",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19801,8 +19867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2271",
-   "self_type" : "type-2270",
+   "referenced_type" : "type-2273",
+   "self_type" : "type-2272",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19811,8 +19877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2311",
-   "self_type" : "type-2310",
+   "referenced_type" : "type-2313",
+   "self_type" : "type-2312",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19821,8 +19887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2362",
-   "self_type" : "type-2361",
+   "referenced_type" : "type-2364",
+   "self_type" : "type-2363",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19831,8 +19897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-2530",
-   "self_type" : "type-2529",
+   "referenced_type" : "type-2532",
+   "self_type" : "type-2531",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19841,8 +19907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-320",
-   "self_type" : "type-319",
+   "referenced_type" : "type-317",
+   "self_type" : "type-316",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19851,8 +19917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-459",
-   "self_type" : "type-458",
+   "referenced_type" : "type-457",
+   "self_type" : "type-456",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19871,8 +19937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-780",
-   "self_type" : "type-779",
+   "referenced_type" : "type-781",
+   "self_type" : "type-780",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19881,8 +19947,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-884",
-   "self_type" : "type-883",
+   "referenced_type" : "type-885",
+   "self_type" : "type-884",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19891,8 +19957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::Dataspace, 61>",
-   "referenced_type" : "type-940",
-   "self_type" : "type-939",
+   "referenced_type" : "type-941",
+   "self_type" : "type-940",
    "size" : 244,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19901,8 +19967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1008",
-   "self_type" : "type-1007",
+   "referenced_type" : "type-1010",
+   "self_type" : "type-1009",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19921,8 +19987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1699",
-   "self_type" : "type-1698",
+   "referenced_type" : "type-1701",
+   "self_type" : "type-1700",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19931,8 +19997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1805",
-   "self_type" : "type-1804",
+   "referenced_type" : "type-1806",
+   "self_type" : "type-1805",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19941,8 +20007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1892",
-   "self_type" : "type-1891",
+   "referenced_type" : "type-1893",
+   "self_type" : "type-1892",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19951,8 +20017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-1970",
-   "self_type" : "type-1969",
+   "referenced_type" : "type-1971",
+   "self_type" : "type-1970",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19961,8 +20027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2100",
-   "self_type" : "type-2099",
+   "referenced_type" : "type-2104",
+   "self_type" : "type-2103",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19971,8 +20037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2199",
-   "self_type" : "type-2198",
+   "referenced_type" : "type-2202",
+   "self_type" : "type-2201",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19981,8 +20047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2267",
-   "self_type" : "type-2266",
+   "referenced_type" : "type-2269",
+   "self_type" : "type-2268",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -19991,8 +20057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2307",
-   "self_type" : "type-2306",
+   "referenced_type" : "type-2309",
+   "self_type" : "type-2308",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20001,8 +20067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2358",
-   "self_type" : "type-2357",
+   "referenced_type" : "type-2360",
+   "self_type" : "type-2359",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20011,8 +20077,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-2526",
-   "self_type" : "type-2525",
+   "referenced_type" : "type-2528",
+   "self_type" : "type-2527",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20021,8 +20087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-315",
-   "self_type" : "type-314",
+   "referenced_type" : "type-313",
+   "self_type" : "type-312",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20031,8 +20097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-455",
-   "self_type" : "type-454",
+   "referenced_type" : "type-452",
+   "self_type" : "type-451",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20041,8 +20107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-665",
-   "self_type" : "type-664",
+   "referenced_type" : "type-666",
+   "self_type" : "type-665",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20051,8 +20117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-776",
-   "self_type" : "type-775",
+   "referenced_type" : "type-777",
+   "self_type" : "type-776",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20061,8 +20127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-880",
-   "self_type" : "type-879",
+   "referenced_type" : "type-881",
+   "self_type" : "type-880",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20071,8 +20137,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::PixelFormat, 27>",
-   "referenced_type" : "type-936",
-   "self_type" : "type-935",
+   "referenced_type" : "type-937",
+   "self_type" : "type-936",
    "size" : 108,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20101,8 +20167,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1708",
-   "self_type" : "type-1707",
+   "referenced_type" : "type-1709",
+   "self_type" : "type-1708",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20111,8 +20177,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1813",
-   "self_type" : "type-1812",
+   "referenced_type" : "type-1814",
+   "self_type" : "type-1813",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20121,8 +20187,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1900",
-   "self_type" : "type-1899",
+   "referenced_type" : "type-1901",
+   "self_type" : "type-1900",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20131,8 +20197,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-1979",
-   "self_type" : "type-1978",
+   "referenced_type" : "type-1980",
+   "self_type" : "type-1979",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20141,8 +20207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2110",
-   "self_type" : "type-2109",
+   "referenced_type" : "type-2112",
+   "self_type" : "type-2111",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20151,8 +20217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2208",
-   "self_type" : "type-2207",
+   "referenced_type" : "type-2212",
+   "self_type" : "type-2211",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20161,8 +20227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2275",
-   "self_type" : "type-2274",
+   "referenced_type" : "type-2277",
+   "self_type" : "type-2276",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20171,8 +20237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2315",
-   "self_type" : "type-2314",
+   "referenced_type" : "type-2317",
+   "self_type" : "type-2316",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20181,8 +20247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2366",
-   "self_type" : "type-2365",
+   "referenced_type" : "type-2368",
+   "self_type" : "type-2367",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20191,8 +20257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-2534",
-   "self_type" : "type-2533",
+   "referenced_type" : "type-2536",
+   "self_type" : "type-2535",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20201,8 +20267,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-324",
-   "self_type" : "type-323",
+   "referenced_type" : "type-321",
+   "self_type" : "type-320",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20211,8 +20277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-464",
-   "self_type" : "type-463",
+   "referenced_type" : "type-461",
+   "self_type" : "type-460",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20221,8 +20287,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-674",
-   "self_type" : "type-673",
+   "referenced_type" : "type-675",
+   "self_type" : "type-674",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20241,8 +20307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-888",
-   "self_type" : "type-887",
+   "referenced_type" : "type-890",
+   "self_type" : "type-889",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20251,8 +20317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_1::RenderIntent, 4>",
-   "referenced_type" : "type-945",
-   "self_type" : "type-944",
+   "referenced_type" : "type-946",
+   "self_type" : "type-945",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.1/android.hardware.graphics.common@1.1_genc++_headers/gen/android/hardware/graphics/common/1.1/types.h"
   },
@@ -20261,8 +20327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1026",
-   "self_type" : "type-1025",
+   "referenced_type" : "type-1027",
+   "self_type" : "type-1026",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20281,8 +20347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1821",
-   "self_type" : "type-1820",
+   "referenced_type" : "type-1822",
+   "self_type" : "type-1821",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20291,8 +20357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-1988",
-   "self_type" : "type-1987",
+   "referenced_type" : "type-1989",
+   "self_type" : "type-1988",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20301,8 +20367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2218",
-   "self_type" : "type-2217",
+   "referenced_type" : "type-2220",
+   "self_type" : "type-2219",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20311,8 +20377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2283",
-   "self_type" : "type-2282",
+   "referenced_type" : "type-2285",
+   "self_type" : "type-2284",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20321,8 +20387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2323",
-   "self_type" : "type-2322",
+   "referenced_type" : "type-2325",
+   "self_type" : "type-2324",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20331,8 +20397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2374",
-   "self_type" : "type-2373",
+   "referenced_type" : "type-2376",
+   "self_type" : "type-2375",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20341,8 +20407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-2546",
-   "self_type" : "type-2545",
+   "referenced_type" : "type-2548",
+   "self_type" : "type-2547",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20351,8 +20417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-473",
-   "self_type" : "type-472",
+   "referenced_type" : "type-470",
+   "self_type" : "type-469",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20361,8 +20427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-794",
-   "self_type" : "type-793",
+   "referenced_type" : "type-795",
+   "self_type" : "type-794",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20371,8 +20437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-898",
-   "self_type" : "type-897",
+   "referenced_type" : "type-899",
+   "self_type" : "type-898",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20381,8 +20447,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::BufferUsage, 26>",
-   "referenced_type" : "type-954",
-   "self_type" : "type-953",
+   "referenced_type" : "type-955",
+   "self_type" : "type-954",
    "size" : 208,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20391,8 +20457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1024",
-   "self_type" : "type-1023",
+   "referenced_type" : "type-1025",
+   "self_type" : "type-1024",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20411,8 +20477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1819",
-   "self_type" : "type-1818",
+   "referenced_type" : "type-1820",
+   "self_type" : "type-1819",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20421,8 +20487,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-1986",
-   "self_type" : "type-1985",
+   "referenced_type" : "type-1987",
+   "self_type" : "type-1986",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20431,8 +20497,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2216",
-   "self_type" : "type-2215",
+   "referenced_type" : "type-2218",
+   "self_type" : "type-2217",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20441,8 +20507,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2281",
-   "self_type" : "type-2280",
+   "referenced_type" : "type-2283",
+   "self_type" : "type-2282",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20451,8 +20517,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2321",
-   "self_type" : "type-2320",
+   "referenced_type" : "type-2323",
+   "self_type" : "type-2322",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20461,8 +20527,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2372",
-   "self_type" : "type-2371",
+   "referenced_type" : "type-2374",
+   "self_type" : "type-2373",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20471,8 +20537,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-2544",
-   "self_type" : "type-2543",
+   "referenced_type" : "type-2546",
+   "self_type" : "type-2545",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20481,8 +20547,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-471",
-   "self_type" : "type-470",
+   "referenced_type" : "type-468",
+   "self_type" : "type-467",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20491,8 +20557,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-792",
-   "self_type" : "type-791",
+   "referenced_type" : "type-793",
+   "self_type" : "type-792",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20501,8 +20567,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-896",
-   "self_type" : "type-895",
+   "referenced_type" : "type-897",
+   "self_type" : "type-896",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20511,8 +20577,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::ColorMode, 14>",
-   "referenced_type" : "type-952",
-   "self_type" : "type-951",
+   "referenced_type" : "type-953",
+   "self_type" : "type-952",
    "size" : 56,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20521,8 +20587,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1022",
-   "self_type" : "type-1021",
+   "referenced_type" : "type-1023",
+   "self_type" : "type-1022",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20541,8 +20607,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1817",
-   "self_type" : "type-1816",
+   "referenced_type" : "type-1818",
+   "self_type" : "type-1817",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20551,8 +20617,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-1983",
-   "self_type" : "type-1982",
+   "referenced_type" : "type-1985",
+   "self_type" : "type-1984",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20561,8 +20627,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2214",
-   "self_type" : "type-2213",
+   "referenced_type" : "type-2216",
+   "self_type" : "type-2215",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20571,8 +20637,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2279",
-   "self_type" : "type-2278",
+   "referenced_type" : "type-2281",
+   "self_type" : "type-2280",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20581,8 +20647,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2319",
-   "self_type" : "type-2318",
+   "referenced_type" : "type-2321",
+   "self_type" : "type-2320",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20591,8 +20657,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2370",
-   "self_type" : "type-2369",
+   "referenced_type" : "type-2372",
+   "self_type" : "type-2371",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20601,8 +20667,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-2542",
-   "self_type" : "type-2541",
+   "referenced_type" : "type-2544",
+   "self_type" : "type-2543",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20611,8 +20677,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-468",
-   "self_type" : "type-467",
+   "referenced_type" : "type-466",
+   "self_type" : "type-465",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20621,8 +20687,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-790",
-   "self_type" : "type-789",
+   "referenced_type" : "type-791",
+   "self_type" : "type-790",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20631,8 +20697,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-894",
-   "self_type" : "type-893",
+   "referenced_type" : "type-895",
+   "self_type" : "type-894",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20641,8 +20707,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Dataspace, 65>",
-   "referenced_type" : "type-950",
-   "self_type" : "type-949",
+   "referenced_type" : "type-951",
+   "self_type" : "type-950",
    "size" : 260,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20671,8 +20737,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1815",
-   "self_type" : "type-1814",
+   "referenced_type" : "type-1816",
+   "self_type" : "type-1815",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20681,8 +20747,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-1981",
-   "self_type" : "type-1980",
+   "referenced_type" : "type-1983",
+   "self_type" : "type-1982",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20691,8 +20757,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2212",
-   "self_type" : "type-2211",
+   "referenced_type" : "type-2214",
+   "self_type" : "type-2213",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20701,8 +20767,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2277",
-   "self_type" : "type-2276",
+   "referenced_type" : "type-2279",
+   "self_type" : "type-2278",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20711,8 +20777,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2317",
-   "self_type" : "type-2316",
+   "referenced_type" : "type-2319",
+   "self_type" : "type-2318",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20721,8 +20787,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2368",
-   "self_type" : "type-2367",
+   "referenced_type" : "type-2370",
+   "self_type" : "type-2369",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20731,8 +20797,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-2540",
-   "self_type" : "type-2539",
+   "referenced_type" : "type-2542",
+   "self_type" : "type-2541",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20741,8 +20807,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-466",
-   "self_type" : "type-465",
+   "referenced_type" : "type-464",
+   "self_type" : "type-463",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20751,8 +20817,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-788",
-   "self_type" : "type-787",
+   "referenced_type" : "type-789",
+   "self_type" : "type-788",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20761,8 +20827,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-892",
-   "self_type" : "type-891",
+   "referenced_type" : "type-893",
+   "self_type" : "type-892",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20771,8 +20837,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::Hdr, 4>",
-   "referenced_type" : "type-947",
-   "self_type" : "type-946",
+   "referenced_type" : "type-948",
+   "self_type" : "type-947",
    "size" : 16,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20781,8 +20847,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1028",
-   "self_type" : "type-1027",
+   "referenced_type" : "type-1029",
+   "self_type" : "type-1028",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20801,8 +20867,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1823",
-   "self_type" : "type-1822",
+   "referenced_type" : "type-1824",
+   "self_type" : "type-1823",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20811,8 +20877,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-1990",
-   "self_type" : "type-1989",
+   "referenced_type" : "type-1992",
+   "self_type" : "type-1991",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20821,8 +20887,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2220",
-   "self_type" : "type-2219",
+   "referenced_type" : "type-2223",
+   "self_type" : "type-2222",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20831,8 +20897,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2285",
-   "self_type" : "type-2284",
+   "referenced_type" : "type-2287",
+   "self_type" : "type-2286",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20841,8 +20907,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2325",
-   "self_type" : "type-2324",
+   "referenced_type" : "type-2327",
+   "self_type" : "type-2326",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20851,8 +20917,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2376",
-   "self_type" : "type-2375",
+   "referenced_type" : "type-2378",
+   "self_type" : "type-2377",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20861,8 +20927,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-2548",
-   "self_type" : "type-2547",
+   "referenced_type" : "type-2550",
+   "self_type" : "type-2549",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20871,8 +20937,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-475",
-   "self_type" : "type-474",
+   "referenced_type" : "type-472",
+   "self_type" : "type-471",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20891,8 +20957,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-900",
-   "self_type" : "type-899",
+   "referenced_type" : "type-901",
+   "self_type" : "type-900",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20901,8 +20967,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
    "name" : "const std::array<android::hardware::graphics::common::V1_2::PixelFormat, 28>",
-   "referenced_type" : "type-956",
-   "self_type" : "type-955",
+   "referenced_type" : "type-957",
+   "self_type" : "type-956",
    "size" : 112,
    "source_file" : "/out/soong/.intermediates/hardware/interfaces/graphics/common/1.2/android.hardware.graphics.common@1.2_genc++_headers/gen/android/hardware/graphics/common/1.2/types.h"
   },
@@ -20911,8 +20977,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1633",
-   "self_type" : "type-1632",
+   "referenced_type" : "type-1637",
+   "self_type" : "type-1636",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20921,8 +20987,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-168",
-   "self_type" : "type-167",
+   "referenced_type" : "type-170",
+   "self_type" : "type-169",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20931,8 +20997,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1870",
-   "self_type" : "type-1869",
+   "referenced_type" : "type-1871",
+   "self_type" : "type-1870",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20941,8 +21007,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-1943",
-   "self_type" : "type-1942",
+   "referenced_type" : "type-1944",
+   "self_type" : "type-1943",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20951,8 +21017,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2083",
-   "self_type" : "type-2082",
+   "referenced_type" : "type-2085",
+   "self_type" : "type-2084",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20961,8 +21027,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2179",
-   "self_type" : "type-2178",
+   "referenced_type" : "type-2182",
+   "self_type" : "type-2181",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20971,8 +21037,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-2251",
-   "self_type" : "type-2250",
+   "referenced_type" : "type-2253",
+   "self_type" : "type-2252",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20981,8 +21047,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-426",
-   "self_type" : "type-425",
+   "referenced_type" : "type-423",
+   "self_type" : "type-422",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -20991,8 +21057,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-646",
-   "self_type" : "type-645",
+   "referenced_type" : "type-647",
+   "self_type" : "type-646",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21001,8 +21067,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
    "name" : "const std::array<android::hidl::base::V1_0::DebugInfo::Architecture, 3>",
-   "referenced_type" : "type-756",
-   "self_type" : "type-755",
+   "referenced_type" : "type-757",
+   "self_type" : "type-756",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/types.h"
   },
@@ -21021,8 +21087,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1016",
-   "self_type" : "type-1015",
+   "referenced_type" : "type-1008",
+   "self_type" : "type-1007",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21031,8 +21097,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-1766",
-   "self_type" : "type-1765",
+   "referenced_type" : "type-1767",
+   "self_type" : "type-1766",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21041,8 +21107,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
    "name" : "const std::basic_string<char, std::char_traits<char>, std::allocator<char> >",
-   "referenced_type" : "type-2104",
-   "self_type" : "type-2103",
+   "referenced_type" : "type-2100",
+   "self_type" : "type-2099",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ColorSpace.h"
   },
@@ -21051,8 +21117,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1758",
-   "self_type" : "type-1757",
+   "referenced_type" : "type-1759",
+   "self_type" : "type-1758",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21061,8 +21127,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-1876",
-   "self_type" : "type-1875",
+   "referenced_type" : "type-1877",
+   "self_type" : "type-1876",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21071,46 +21137,6 @@
    "is_const" : true,
    "linker_set_key" : "const std::float_denorm_style",
    "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-2403",
-   "self_type" : "type-2402",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_denorm_style",
-   "name" : "const std::float_denorm_style",
-   "referenced_type" : "type-768",
-   "self_type" : "type-767",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1761",
-   "self_type" : "type-1760",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
-   "referenced_type" : "type-1946",
-   "self_type" : "type-1945",
-   "size" : 4,
-   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
-  },
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "const std::float_round_style",
-   "name" : "const std::float_round_style",
    "referenced_type" : "type-2405",
    "self_type" : "type-2404",
    "size" : 4,
@@ -21119,10 +21145,50 @@
   {
    "alignment" : 4,
    "is_const" : true,
+   "linker_set_key" : "const std::float_denorm_style",
+   "name" : "const std::float_denorm_style",
+   "referenced_type" : "type-762",
+   "self_type" : "type-761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
    "linker_set_key" : "const std::float_round_style",
    "name" : "const std::float_round_style",
-   "referenced_type" : "type-858",
-   "self_type" : "type-857",
+   "referenced_type" : "type-1762",
+   "self_type" : "type-1761",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-1947",
+   "self_type" : "type-1946",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-2407",
+   "self_type" : "type-2406",
+   "size" : 4,
+   "source_file" : "/frameworks/native/libs/math/include/math/half.h"
+  },
+  {
+   "alignment" : 4,
+   "is_const" : true,
+   "linker_set_key" : "const std::float_round_style",
+   "name" : "const std::float_round_style",
+   "referenced_type" : "type-855",
+   "self_type" : "type-854",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h"
   },
@@ -21141,8 +21207,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-1778",
-   "self_type" : "type-1777",
+   "referenced_type" : "type-1779",
+   "self_type" : "type-1778",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21151,8 +21217,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::function<float (float)>",
    "name" : "const std::function<float (float)>",
-   "referenced_type" : "type-2223",
-   "self_type" : "type-2222",
+   "referenced_type" : "type-2225",
+   "self_type" : "type-2224",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h"
   },
@@ -21161,8 +21227,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1392",
-   "self_type" : "type-1391",
+   "referenced_type" : "type-1396",
+   "self_type" : "type-1395",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21171,8 +21237,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-1840",
-   "self_type" : "type-1839",
+   "referenced_type" : "type-1841",
+   "self_type" : "type-1840",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21181,8 +21247,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::shared_ptr<android::FenceTime>",
    "name" : "const std::shared_ptr<android::FenceTime>",
-   "referenced_type" : "type-2663",
-   "self_type" : "type-2662",
+   "referenced_type" : "type-2668",
+   "self_type" : "type-2667",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -21191,8 +21257,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
    "name" : "const std::vector<android::hardware::graphics::common::V1_2::Hdr, std::allocator<android::hardware::graphics::common::V1_2::Hdr> >",
-   "referenced_type" : "type-2331",
-   "self_type" : "type-2330",
+   "referenced_type" : "type-2333",
+   "self_type" : "type-2332",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/HdrCapabilities.h"
   },
@@ -21211,8 +21277,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<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-1033",
+   "self_type" : "type-1032",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21231,8 +21297,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1582",
-   "self_type" : "type-1581",
+   "referenced_type" : "type-1586",
+   "self_type" : "type-1585",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21241,8 +21307,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1713",
-   "self_type" : "type-1712",
+   "referenced_type" : "type-1714",
+   "self_type" : "type-1713",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21251,8 +21317,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1826",
-   "self_type" : "type-1825",
+   "referenced_type" : "type-1827",
+   "self_type" : "type-1826",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21261,8 +21327,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1852",
-   "self_type" : "type-1851",
+   "referenced_type" : "type-1853",
+   "self_type" : "type-1852",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21271,8 +21337,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1903",
-   "self_type" : "type-1902",
+   "referenced_type" : "type-1904",
+   "self_type" : "type-1903",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21281,8 +21347,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-1994",
-   "self_type" : "type-1993",
+   "referenced_type" : "type-1995",
+   "self_type" : "type-1994",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21291,8 +21357,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2075",
-   "self_type" : "type-2074",
+   "referenced_type" : "type-2077",
+   "self_type" : "type-2076",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21301,8 +21367,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2150",
-   "self_type" : "type-2149",
+   "referenced_type" : "type-2153",
+   "self_type" : "type-2152",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21311,8 +21377,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2233",
-   "self_type" : "type-2232",
+   "referenced_type" : "type-2235",
+   "self_type" : "type-2234",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21321,8 +21387,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2328",
-   "self_type" : "type-2327",
+   "referenced_type" : "type-2330",
+   "self_type" : "type-2329",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21331,8 +21397,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2379",
-   "self_type" : "type-2378",
+   "referenced_type" : "type-2381",
+   "self_type" : "type-2380",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21341,8 +21407,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-2566",
-   "self_type" : "type-2565",
+   "referenced_type" : "type-2568",
+   "self_type" : "type-2567",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21351,8 +21417,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-329",
-   "self_type" : "type-328",
+   "referenced_type" : "type-326",
+   "self_type" : "type-325",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21361,8 +21427,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-46",
-   "self_type" : "type-45",
+   "referenced_type" : "type-476",
+   "self_type" : "type-475",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21371,8 +21437,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-479",
-   "self_type" : "type-478",
+   "referenced_type" : "type-48",
+   "self_type" : "type-47",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21391,8 +21457,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-727",
-   "self_type" : "type-726",
+   "referenced_type" : "type-728",
+   "self_type" : "type-727",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21401,8 +21467,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-833",
-   "self_type" : "type-832",
+   "referenced_type" : "type-834",
+   "self_type" : "type-833",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21411,8 +21477,8 @@
    "is_const" : true,
    "linker_set_key" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
    "name" : "const std::vector<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)>, std::allocator<std::function<void (InstrumentationEvent, const char *, const char *, const char *, const char *, vector<void *, allocator<void *> > *)> > >",
-   "referenced_type" : "type-960",
-   "self_type" : "type-959",
+   "referenced_type" : "type-962",
+   "self_type" : "type-961",
    "size" : 12,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h"
   },
@@ -21421,8 +21487,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned char",
    "name" : "const unsigned char",
-   "referenced_type" : "type-218",
-   "self_type" : "type-224",
+   "referenced_type" : "type-220",
+   "self_type" : "type-226",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21431,8 +21497,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned int",
    "name" : "const unsigned int",
-   "referenced_type" : "type-123",
-   "self_type" : "type-236",
+   "referenced_type" : "type-125",
+   "self_type" : "type-238",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h"
   },
@@ -21441,8 +21507,8 @@
    "is_const" : true,
    "linker_set_key" : "const unsigned long long",
    "name" : "const unsigned long long",
-   "referenced_type" : "type-124",
-   "self_type" : "type-226",
+   "referenced_type" : "type-126",
+   "self_type" : "type-228",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h"
   },
@@ -21460,7 +21526,7 @@
    "is_const" : true,
    "linker_set_key" : "const void",
    "name" : "const void",
-   "referenced_type" : "type-151",
+   "referenced_type" : "type-154",
    "self_type" : "type-1118",
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
   },
@@ -21469,8 +21535,8 @@
    "is_const" : true,
    "linker_set_key" : "unsigned int const[3]",
    "name" : "unsigned int const[3]",
-   "referenced_type" : "type-941",
-   "self_type" : "type-948",
+   "referenced_type" : "type-935",
+   "self_type" : "type-942",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h"
   },
@@ -21480,7 +21546,7 @@
    "linker_set_key" : "volatile bool",
    "name" : "volatile bool",
    "referenced_type" : "type-6",
-   "self_type" : "type-270",
+   "self_type" : "type-266",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Thread.h"
   },
@@ -21489,8 +21555,8 @@
    "is_volatile" : true,
    "linker_set_key" : "volatile int",
    "name" : "volatile int",
-   "referenced_type" : "type-103",
-   "self_type" : "type-275",
+   "referenced_type" : "type-105",
+   "self_type" : "type-271",
    "size" : 4,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h"
   }
@@ -21503,48 +21569,48 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "layers",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "format",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "usage",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "stride",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu0",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rfu1",
      "field_offset" : 256,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Desc",
    "name" : "AHardwareBuffer_Desc",
-   "referenced_type" : "type-683",
-   "self_type" : "type-683",
+   "referenced_type" : "type-685",
+   "self_type" : "type-685",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Desc"
@@ -21555,23 +21621,23 @@
    [
     {
      "field_name" : "data",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "pixelStride",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "rowStride",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Plane",
    "name" : "AHardwareBuffer_Plane",
-   "referenced_type" : "type-509",
-   "self_type" : "type-509",
+   "referenced_type" : "type-506",
+   "self_type" : "type-506",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Plane"
@@ -21582,18 +21648,18 @@
    [
     {
      "field_name" : "planeCount",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
      "field_offset" : 32,
-     "referenced_type" : "type-508"
+     "referenced_type" : "type-505"
     }
    ],
    "linker_set_key" : "AHardwareBuffer_Planes",
    "name" : "AHardwareBuffer_Planes",
-   "referenced_type" : "type-507",
-   "self_type" : "type-507",
+   "referenced_type" : "type-504",
+   "self_type" : "type-504",
    "size" : 52,
    "source_file" : "/frameworks/native/libs/nativewindow/include/android/hardware_buffer.h",
    "unique_id" : "AHardwareBuffer_Planes"
@@ -21604,63 +21670,63 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-518"
+     "referenced_type" : "type-516"
     },
     {
      "field_name" : "width",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 288,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "stride",
      "field_offset" : 320,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "format",
      "field_offset" : 352,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "usage_deprecated",
      "field_offset" : 384,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "layerCount",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 448,
-     "referenced_type" : "type-523"
+     "referenced_type" : "type-521"
     },
     {
      "field_name" : "handle",
      "field_offset" : 480,
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "usage",
      "field_offset" : 512,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 576,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "ANativeWindowBuffer",
    "name" : "ANativeWindowBuffer",
-   "referenced_type" : "type-517",
-   "self_type" : "type-517",
+   "referenced_type" : "type-515",
+   "self_type" : "type-515",
    "size" : 96,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "ANativeWindowBuffer"
@@ -21671,22 +21737,22 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "ARect",
@@ -21703,7 +21769,7 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "alloc",
@@ -21739,20 +21805,20 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-517"
+     "referenced_type" : "type-515"
     },
     {
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "name" : "android::ANativeObjectBase<ANativeWindowBuffer, android::GraphicBuffer, android::RefBase, android_native_base_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-516",
-   "self_type" : "type-516",
+   "referenced_type" : "type-514",
+   "self_type" : "type-514",
    "size" : 104,
    "source_file" : "/frameworks/native/libs/ui/include/ui/ANativeObjectBase.h",
-   "template_args" : [ "type-517", "type-525", "type-172", "type-518" ],
+   "template_args" : [ "type-515", "type-523", "type-175", "type-516" ],
    "unique_id" : "_ZTSN7android17ANativeObjectBaseI19ANativeWindowBufferNS_13GraphicBufferENS_7RefBaseE21android_native_base_tEE",
    "vtable_components" :
    [
@@ -21840,7 +21906,7 @@
      "access" : "private",
      "field_name" : "mWhitePoint",
      "field_offset" : 1664,
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "linker_set_key" : "android::ColorSpace",
@@ -21947,14 +22013,14 @@
     {
      "access" : "private",
      "field_name" : "mCond",
-     "referenced_type" : "type-259"
+     "referenced_type" : "type-255"
     }
    ],
    "linker_set_key" : "android::Condition",
    "name" : "android::Condition",
    "record_kind" : "class",
-   "referenced_type" : "type-258",
-   "self_type" : "type-258",
+   "referenced_type" : "type-254",
+   "self_type" : "type-254",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Condition.h",
    "unique_id" : "_ZTSN7android9ConditionE"
@@ -21995,13 +22061,13 @@
     {
      "access" : "private",
      "field_name" : "mState",
-     "referenced_type" : "type-1377"
+     "referenced_type" : "type-1382"
     },
     {
      "access" : "private",
      "field_name" : "mMutex",
      "field_offset" : 32,
-     "referenced_type" : "type-1379"
+     "referenced_type" : "type-1384"
     },
     {
      "access" : "private",
@@ -22013,14 +22079,14 @@
      "access" : "private",
      "field_name" : "mSignalTime",
      "field_offset" : 128,
-     "referenced_type" : "type-1380"
+     "referenced_type" : "type-1385"
     }
    ],
    "linker_set_key" : "android::FenceTime",
    "name" : "android::FenceTime",
    "record_kind" : "class",
-   "referenced_type" : "type-1376",
-   "self_type" : "type-1376",
+   "referenced_type" : "type-1381",
+   "self_type" : "type-1381",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTimeE"
@@ -22030,14 +22096,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1385"
+     "referenced_type" : "type-1389"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "state",
-     "referenced_type" : "type-1384"
+     "referenced_type" : "type-1388"
     },
     {
      "field_name" : "fence",
@@ -22047,13 +22113,13 @@
     {
      "field_name" : "signalTime",
      "field_offset" : 64,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     }
    ],
    "linker_set_key" : "android::FenceTime::Snapshot",
    "name" : "android::FenceTime::Snapshot",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1383",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1387",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android9FenceTime8SnapshotE"
@@ -22065,20 +22131,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1398"
+     "referenced_type" : "type-1402"
     },
     {
      "access" : "private",
      "field_name" : "mQueue",
      "field_offset" : 32,
-     "referenced_type" : "type-1399"
+     "referenced_type" : "type-1403"
     }
    ],
    "linker_set_key" : "android::FenceTimeline",
    "name" : "android::FenceTimeline",
    "record_kind" : "class",
-   "referenced_type" : "type-1397",
-   "self_type" : "type-1397",
+   "referenced_type" : "type-1401",
+   "self_type" : "type-1401",
    "size" : 28,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android13FenceTimelineE"
@@ -22090,20 +22156,20 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-1403"
+     "referenced_type" : "type-1407"
     },
     {
      "access" : "private",
      "field_name" : "mMap",
      "field_offset" : 32,
-     "referenced_type" : "type-1404"
+     "referenced_type" : "type-1408"
     }
    ],
    "linker_set_key" : "android::FenceToFenceTimeMap",
    "name" : "android::FenceToFenceTimeMap",
    "record_kind" : "class",
-   "referenced_type" : "type-1402",
-   "self_type" : "type-1402",
+   "referenced_type" : "type-1406",
+   "self_type" : "type-1406",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h",
    "unique_id" : "_ZTSN7android19FenceToFenceTimeMapE"
@@ -22125,11 +22191,11 @@
    "linker_set_key" : "android::Flattenable<android::FenceTime::Snapshot>",
    "name" : "android::Flattenable<android::FenceTime::Snapshot>",
    "record_kind" : "class",
-   "referenced_type" : "type-1385",
-   "self_type" : "type-1385",
+   "referenced_type" : "type-1389",
+   "self_type" : "type-1389",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1383" ],
+   "template_args" : [ "type-1387" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_9FenceTime8SnapshotEEE"
   },
   {
@@ -22137,11 +22203,11 @@
    "linker_set_key" : "android::Flattenable<android::GraphicBuffer>",
    "name" : "android::Flattenable<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-532",
-   "self_type" : "type-532",
+   "referenced_type" : "type-530",
+   "self_type" : "type-530",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android11FlattenableINS_13GraphicBufferEEE"
   },
   {
@@ -22193,36 +22259,36 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1419"
+     "referenced_type" : "type-1423"
     }
    ],
    "fields" :
    [
     {
      "field_name" : "refreshPeriodNano",
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "field_name" : "desiredPresentTimesNano",
      "field_offset" : 64,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "actualPresentTimesNano",
      "field_offset" : 224,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     },
     {
      "field_name" : "frameReadyTimesNano",
      "field_offset" : 384,
-     "referenced_type" : "type-1421"
+     "referenced_type" : "type-1425"
     }
    ],
    "linker_set_key" : "android::FrameStats",
    "name" : "android::FrameStats",
    "record_kind" : "class",
-   "referenced_type" : "type-1420",
-   "self_type" : "type-1420",
+   "referenced_type" : "type-1424",
+   "self_type" : "type-1424",
    "size" : 68,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FrameStats.h",
    "unique_id" : "_ZTSN7android10FrameStatsE"
@@ -22232,7 +22298,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-359"
+     "referenced_type" : "type-356"
     }
    ],
    "fields" :
@@ -22241,20 +22307,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-354"
+     "referenced_type" : "type-351"
     },
     {
      "access" : "private",
      "field_name" : "mAllocator",
      "field_offset" : 64,
-     "referenced_type" : "type-355"
+     "referenced_type" : "type-352"
     }
    ],
    "linker_set_key" : "android::Gralloc2Allocator",
    "name" : "android::Gralloc2Allocator",
    "record_kind" : "class",
-   "referenced_type" : "type-353",
-   "self_type" : "type-353",
+   "referenced_type" : "type-350",
+   "self_type" : "type-350",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android17Gralloc2AllocatorE",
@@ -22291,7 +22357,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-342"
+     "referenced_type" : "type-339"
     }
    ],
    "fields" :
@@ -22300,20 +22366,20 @@
      "access" : "private",
      "field_name" : "mMapper",
      "field_offset" : 32,
-     "referenced_type" : "type-338"
+     "referenced_type" : "type-335"
     },
     {
      "access" : "private",
      "field_name" : "mMapperV2_1",
      "field_offset" : 64,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::Gralloc2Mapper",
    "name" : "android::Gralloc2Mapper",
    "record_kind" : "class",
-   "referenced_type" : "type-337",
-   "self_type" : "type-337",
+   "referenced_type" : "type-334",
+   "self_type" : "type-334",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Gralloc2.h",
    "unique_id" : "_ZTSN7android14Gralloc2MapperE",
@@ -22371,10 +22437,10 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-516"
+     "referenced_type" : "type-514"
     },
     {
-     "referenced_type" : "type-532"
+     "referenced_type" : "type-530"
     }
    ],
    "fields" :
@@ -22383,62 +22449,62 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 832,
-     "referenced_type" : "type-218"
+     "referenced_type" : "type-220"
     },
     {
      "access" : "private",
      "field_name" : "mBufferMapper",
      "field_offset" : 864,
-     "referenced_type" : "type-526"
+     "referenced_type" : "type-524"
     },
     {
      "access" : "private",
      "field_name" : "mInitCheck",
      "field_offset" : 896,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumFds",
      "field_offset" : 928,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mTransportNumInts",
      "field_offset" : 960,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mId",
      "field_offset" : 992,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
      "field_name" : "mBufferId",
      "field_offset" : 1056,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mGenerationNumber",
      "field_offset" : 1088,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDeathCallbacks",
      "field_offset" : 1120,
-     "referenced_type" : "type-531"
+     "referenced_type" : "type-529"
     }
    ],
    "linker_set_key" : "android::GraphicBuffer",
    "name" : "android::GraphicBuffer",
    "record_kind" : "class",
-   "referenced_type" : "type-525",
-   "self_type" : "type-525",
+   "referenced_type" : "type-523",
+   "self_type" : "type-523",
    "size" : 152,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBuffer.h",
    "unique_id" : "_ZTSN7android13GraphicBufferE",
@@ -22478,7 +22544,91 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-541"
+     "referenced_type" : "type-538"
+    }
+   ],
+   "fields" :
+   [
+    {
+     "access" : "protected",
+     "field_name" : "mMapper",
+     "referenced_type" : "type-524"
+    },
+    {
+     "access" : "protected",
+     "field_name" : "mAllocator",
+     "field_offset" : 32,
+     "referenced_type" : "type-540"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator",
+   "name" : "android::GraphicBufferAllocator",
+   "record_kind" : "class",
+   "referenced_type" : "type-539",
+   "self_type" : "type-539",
+   "size" : 8,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
+  },
+  {
+   "access" : "protected",
+   "alignment" : 4,
+   "fields" :
+   [
+    {
+     "field_name" : "width",
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "height",
+     "field_offset" : 32,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "stride",
+     "field_offset" : 64,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "format",
+     "field_offset" : 96,
+     "referenced_type" : "type-105"
+    },
+    {
+     "field_name" : "layerCount",
+     "field_offset" : 128,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "usage",
+     "field_offset" : 160,
+     "referenced_type" : "type-126"
+    },
+    {
+     "field_name" : "size",
+     "field_offset" : 224,
+     "referenced_type" : "type-125"
+    },
+    {
+     "field_name" : "requestorName",
+     "field_offset" : 256,
+     "referenced_type" : "type-681"
+    }
+   ],
+   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
+   "referenced_type" : "type-680",
+   "self_type" : "type-680",
+   "size" : 44,
+   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
+   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
+  },
+  {
+   "alignment" : 4,
+   "base_specifiers" :
+   [
+    {
+     "referenced_type" : "type-528"
     }
    ],
    "fields" :
@@ -22490,100 +22640,16 @@
     },
     {
      "access" : "private",
-     "field_name" : "mAllocator",
-     "field_offset" : 32,
-     "referenced_type" : "type-543"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator",
-   "name" : "android::GraphicBufferAllocator",
-   "record_kind" : "class",
-   "referenced_type" : "type-542",
-   "self_type" : "type-542",
-   "size" : 8,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocatorE"
-  },
-  {
-   "access" : "private",
-   "alignment" : 4,
-   "fields" :
-   [
-    {
-     "field_name" : "width",
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "height",
-     "field_offset" : 32,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "stride",
-     "field_offset" : 64,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "format",
-     "field_offset" : 96,
-     "referenced_type" : "type-103"
-    },
-    {
-     "field_name" : "layerCount",
-     "field_offset" : 128,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "usage",
-     "field_offset" : 160,
-     "referenced_type" : "type-124"
-    },
-    {
-     "field_name" : "size",
-     "field_offset" : 224,
-     "referenced_type" : "type-123"
-    },
-    {
-     "field_name" : "requestorName",
-     "field_offset" : 256,
-     "referenced_type" : "type-677"
-    }
-   ],
-   "linker_set_key" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "name" : "android::GraphicBufferAllocator::alloc_rec_t",
-   "referenced_type" : "type-676",
-   "self_type" : "type-676",
-   "size" : 44,
-   "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferAllocator.h",
-   "unique_id" : "_ZTSN7android22GraphicBufferAllocator11alloc_rec_tE"
-  },
-  {
-   "alignment" : 4,
-   "base_specifiers" :
-   [
-    {
-     "referenced_type" : "type-530"
-    }
-   ],
-   "fields" :
-   [
-    {
-     "access" : "private",
-     "field_name" : "mMapper",
-     "referenced_type" : "type-528"
-    },
-    {
-     "access" : "private",
      "field_name" : "mMapperVersion",
      "field_offset" : 32,
-     "referenced_type" : "type-529"
+     "referenced_type" : "type-527"
     }
    ],
    "linker_set_key" : "android::GraphicBufferMapper",
    "name" : "android::GraphicBufferMapper",
    "record_kind" : "class",
-   "referenced_type" : "type-527",
-   "self_type" : "type-527",
+   "referenced_type" : "type-525",
+   "self_type" : "type-525",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/ui/include/ui/GraphicBufferMapper.h",
    "unique_id" : "_ZTSN7android19GraphicBufferMapperE"
@@ -22638,17 +22704,17 @@
     {
      "access" : "private",
      "field_name" : "mVector",
-     "referenced_type" : "type-233"
+     "referenced_type" : "type-235"
     }
    ],
    "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-247",
-   "self_type" : "type-247",
+   "referenced_type" : "type-249",
+   "self_type" : "type-249",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-179", "type-248" ],
+   "template_args" : [ "type-182", "type-250" ],
    "unique_id" : "_ZTSN7android11KeyedVectorINS_8String16ENS_2spINS_8hardware7IBinderEEEEE"
   },
   {
@@ -22664,11 +22730,11 @@
    "linker_set_key" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::KeyedVector<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "record_kind" : "class",
-   "referenced_type" : "type-715",
-   "self_type" : "type-715",
+   "referenced_type" : "type-716",
+   "self_type" : "type-716",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/KeyedVector.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android11KeyedVectorIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -22676,11 +22742,11 @@
    "linker_set_key" : "android::LightFlattenable<android::FrameStats>",
    "name" : "android::LightFlattenable<android::FrameStats>",
    "record_kind" : "class",
-   "referenced_type" : "type-1419",
-   "self_type" : "type-1419",
+   "referenced_type" : "type-1423",
+   "self_type" : "type-1423",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-1420" ],
+   "template_args" : [ "type-1424" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_10FrameStatsEEE"
   },
   {
@@ -22724,11 +22790,11 @@
    "linker_set_key" : "android::LightFlattenable<android::Region>",
    "name" : "android::LightFlattenable<android::Region>",
    "record_kind" : "class",
-   "referenced_type" : "type-2390",
-   "self_type" : "type-2390",
+   "referenced_type" : "type-2392",
+   "self_type" : "type-2392",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Flattenable.h",
-   "template_args" : [ "type-2389" ],
+   "template_args" : [ "type-2391" ],
    "unique_id" : "_ZTSN7android16LightFlattenableINS_6RegionEEE"
   },
   {
@@ -22834,14 +22900,14 @@
     {
      "access" : "private",
      "field_name" : "mMutex",
-     "referenced_type" : "type-253"
+     "referenced_type" : "type-281"
     }
    ],
    "linker_set_key" : "android::Mutex",
    "name" : "android::Mutex",
    "record_kind" : "class",
-   "referenced_type" : "type-252",
-   "self_type" : "type-252",
+   "referenced_type" : "type-280",
+   "self_type" : "type-280",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5MutexE"
@@ -22853,14 +22919,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-256"
+     "referenced_type" : "type-1379"
     }
    ],
    "linker_set_key" : "android::Mutex::Autolock",
    "name" : "android::Mutex::Autolock",
    "record_kind" : "class",
-   "referenced_type" : "type-255",
-   "self_type" : "type-255",
+   "referenced_type" : "type-1378",
+   "self_type" : "type-1378",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/Mutex.h",
    "unique_id" : "_ZTSN7android5Mutex8AutolockE"
@@ -22909,12 +22975,12 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "y",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Point",
@@ -22933,14 +22999,14 @@
     {
      "access" : "private",
      "field_name" : "mRWLock",
-     "referenced_type" : "type-263"
+     "referenced_type" : "type-259"
     }
    ],
    "linker_set_key" : "android::RWLock",
    "name" : "android::RWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-262",
-   "self_type" : "type-262",
+   "referenced_type" : "type-258",
+   "self_type" : "type-258",
    "size" : 40,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLockE"
@@ -22952,14 +23018,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoRLock",
    "name" : "android::RWLock::AutoRLock",
    "record_kind" : "class",
-   "referenced_type" : "type-265",
-   "self_type" : "type-265",
+   "referenced_type" : "type-261",
+   "self_type" : "type-261",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoRLockE"
@@ -22971,14 +23037,14 @@
     {
      "access" : "private",
      "field_name" : "mLock",
-     "referenced_type" : "type-266"
+     "referenced_type" : "type-262"
     }
    ],
    "linker_set_key" : "android::RWLock::AutoWLock",
    "name" : "android::RWLock::AutoWLock",
    "record_kind" : "class",
-   "referenced_type" : "type-268",
-   "self_type" : "type-268",
+   "referenced_type" : "type-264",
+   "self_type" : "type-264",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/RWLock.h",
    "unique_id" : "_ZTSN7android6RWLock9AutoWLockE"
@@ -23011,14 +23077,14 @@
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 32,
-     "referenced_type" : "type-173"
+     "referenced_type" : "type-176"
     }
    ],
    "linker_set_key" : "android::RefBase",
    "name" : "android::RefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-172",
-   "self_type" : "type-172",
+   "referenced_type" : "type-175",
+   "self_type" : "type-175",
    "size" : 8,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBaseE",
@@ -23058,8 +23124,8 @@
    "linker_set_key" : "android::RefBase::weakref_type",
    "name" : "android::RefBase::weakref_type",
    "record_kind" : "class",
-   "referenced_type" : "type-198",
-   "self_type" : "type-198",
+   "referenced_type" : "type-211",
+   "self_type" : "type-211",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/RefBase.h",
    "unique_id" : "_ZTSN7android7RefBase12weakref_typeE"
@@ -23105,7 +23171,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2390"
+     "referenced_type" : "type-2392"
     }
    ],
    "fields" :
@@ -23113,14 +23179,14 @@
     {
      "access" : "private",
      "field_name" : "mStorage",
-     "referenced_type" : "type-2382"
+     "referenced_type" : "type-2384"
     }
    ],
    "linker_set_key" : "android::Region",
    "name" : "android::Region",
    "record_kind" : "class",
-   "referenced_type" : "type-2389",
-   "self_type" : "type-2389",
+   "referenced_type" : "type-2391",
+   "self_type" : "type-2391",
    "size" : 20,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Region.h",
    "unique_id" : "_ZTSN7android6RegionE"
@@ -23132,7 +23198,7 @@
     {
      "access" : "private",
      "field_name" : "mTag",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::ScopedTrace",
@@ -23149,11 +23215,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferAllocator>",
    "name" : "android::Singleton<android::GraphicBufferAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-541",
-   "self_type" : "type-541",
+   "referenced_type" : "type-538",
+   "self_type" : "type-538",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-542" ],
+   "template_args" : [ "type-539" ],
    "unique_id" : "_ZTSN7android9SingletonINS_22GraphicBufferAllocatorEEE"
   },
   {
@@ -23161,11 +23227,11 @@
    "linker_set_key" : "android::Singleton<android::GraphicBufferMapper>",
    "name" : "android::Singleton<android::GraphicBufferMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-530",
-   "self_type" : "type-530",
+   "referenced_type" : "type-528",
+   "self_type" : "type-528",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/Singleton.h",
-   "template_args" : [ "type-527" ],
+   "template_args" : [ "type-525" ],
    "unique_id" : "_ZTSN7android9SingletonINS_19GraphicBufferMapperEEE"
   },
   {
@@ -23174,17 +23240,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "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-233",
-   "self_type" : "type-233",
+   "referenced_type" : "type-235",
+   "self_type" : "type-235",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/SortedVector.h",
-   "template_args" : [ "type-237" ],
+   "template_args" : [ "type-239" ],
    "unique_id" : "_ZTSN7android12SortedVectorINS_16key_value_pair_tINS_8String16ENS_2spINS_8hardware7IBinderEEEEEEE",
    "vtable_components" :
    [
@@ -23232,7 +23298,7 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-234"
+     "referenced_type" : "type-236"
     }
    ],
    "linker_set_key" : "android::SortedVector<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
@@ -23289,14 +23355,14 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::SortedVectorImpl",
    "name" : "android::SortedVectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-234",
-   "self_type" : "type-234",
+   "referenced_type" : "type-236",
+   "self_type" : "type-236",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android16SortedVectorImplE",
@@ -23354,14 +23420,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-180"
+     "referenced_type" : "type-183"
     }
    ],
    "linker_set_key" : "android::String16",
    "name" : "android::String16",
    "record_kind" : "class",
-   "referenced_type" : "type-179",
-   "self_type" : "type-179",
+   "referenced_type" : "type-182",
+   "self_type" : "type-182",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
    "unique_id" : "_ZTSN7android8String16E"
@@ -23373,14 +23439,14 @@
     {
      "access" : "private",
      "field_name" : "mString",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     }
    ],
    "linker_set_key" : "android::String8",
    "name" : "android::String8",
    "record_kind" : "class",
-   "referenced_type" : "type-285",
-   "self_type" : "type-285",
+   "referenced_type" : "type-282",
+   "self_type" : "type-282",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
    "unique_id" : "_ZTSN7android7String8E"
@@ -23391,7 +23457,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -23400,62 +23466,62 @@
      "access" : "private",
      "field_name" : "mCanCallJava",
      "field_offset" : 32,
-     "referenced_type" : "type-370"
+     "referenced_type" : "type-367"
     },
     {
      "access" : "private",
      "field_name" : "mThread",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 96,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mThreadExitedCondition",
      "field_offset" : 128,
-     "referenced_type" : "type-258"
+     "referenced_type" : "type-254"
     },
     {
      "access" : "private",
      "field_name" : "mStatus",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExitPending",
      "field_offset" : 192,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mRunning",
      "field_offset" : 200,
-     "referenced_type" : "type-270"
+     "referenced_type" : "type-266"
     },
     {
      "access" : "private",
      "field_name" : "mHoldSelf",
      "field_offset" : 224,
-     "referenced_type" : "type-367"
+     "referenced_type" : "type-364"
     },
     {
      "access" : "private",
      "field_name" : "mTid",
      "field_offset" : 256,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::Thread",
    "name" : "android::Thread",
    "record_kind" : "class",
-   "referenced_type" : "type-369",
-   "self_type" : "type-369",
+   "referenced_type" : "type-366",
+   "self_type" : "type-366",
    "size" : 44,
    "source_file" : "/system/core/libutils/include/utils/Thread.h",
    "unique_id" : "_ZTSN7android6ThreadE",
@@ -23545,14 +23611,14 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::Rect>",
    "name" : "android::Vector<android::Rect>",
    "record_kind" : "class",
-   "referenced_type" : "type-2382",
-   "self_type" : "type-2382",
+   "referenced_type" : "type-2384",
+   "self_type" : "type-2384",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
    "template_args" : [ "type-1241" ],
@@ -23600,17 +23666,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase *>",
    "name" : "android::Vector<android::RefBase *>",
    "record_kind" : "class",
-   "referenced_type" : "type-245",
-   "self_type" : "type-245",
+   "referenced_type" : "type-247",
+   "self_type" : "type-247",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-246" ],
+   "template_args" : [ "type-248" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBaseEEE",
    "vtable_components" :
    [
@@ -23655,17 +23721,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::RefBase::weakref_type *>",
    "name" : "android::Vector<android::RefBase::weakref_type *>",
    "record_kind" : "class",
-   "referenced_type" : "type-244",
-   "self_type" : "type-244",
+   "referenced_type" : "type-246",
+   "self_type" : "type-246",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-197" ],
+   "template_args" : [ "type-210" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_7RefBase12weakref_typeEEE",
    "vtable_components" :
    [
@@ -23710,17 +23776,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::BHwBinder *>",
    "name" : "android::Vector<android::hardware::BHwBinder *>",
    "record_kind" : "class",
-   "referenced_type" : "type-240",
-   "self_type" : "type-240",
+   "referenced_type" : "type-242",
+   "self_type" : "type-242",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-241" ],
+   "template_args" : [ "type-243" ],
    "unique_id" : "_ZTSN7android6VectorIPNS_8hardware9BHwBinderEEE",
    "vtable_components" :
    [
@@ -23765,17 +23831,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "name" : "android::Vector<android::hardware::ProcessState::handle_entry>",
    "record_kind" : "class",
-   "referenced_type" : "type-238",
-   "self_type" : "type-238",
+   "referenced_type" : "type-240",
+   "self_type" : "type-240",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-239" ],
+   "template_args" : [ "type-241" ],
    "unique_id" : "_ZTSN7android6VectorINS_8hardware12ProcessState12handle_entryEEE",
    "vtable_components" :
    [
@@ -23820,17 +23886,17 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-235"
+     "referenced_type" : "type-237"
     }
    ],
    "linker_set_key" : "android::Vector<long long>",
    "name" : "android::Vector<long long>",
    "record_kind" : "class",
-   "referenced_type" : "type-1421",
-   "self_type" : "type-1421",
+   "referenced_type" : "type-1425",
+   "self_type" : "type-1425",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/Vector.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6VectorIxEE",
    "vtable_components" :
    [
@@ -23877,32 +23943,32 @@
      "access" : "private",
      "field_name" : "mStorage",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mCount",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mFlags",
      "field_offset" : 96,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mItemSize",
      "field_offset" : 128,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     }
    ],
    "linker_set_key" : "android::VectorImpl",
    "name" : "android::VectorImpl",
    "record_kind" : "class",
-   "referenced_type" : "type-235",
-   "self_type" : "type-235",
+   "referenced_type" : "type-237",
+   "self_type" : "type-237",
    "size" : 20,
    "source_file" : "/system/core/libutils/include/utils/VectorImpl.h",
    "unique_id" : "_ZTSN7android10VectorImplE",
@@ -23988,11 +24054,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::aggregate_traits<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-824",
-   "self_type" : "type-824",
+   "referenced_type" : "type-825",
+   "self_type" : "type-825",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16aggregate_traitsIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -24012,7 +24078,7 @@
     {
      "access" : "private",
      "field_name" : "fd_",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::base::unique_fd_impl<android::base::DefaultCloser>",
@@ -24077,28 +24143,28 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2410"
+     "referenced_type" : "type-2412"
+    },
+    {
+     "referenced_type" : "type-2413"
     },
     {
      "referenced_type" : "type-2411"
     },
     {
-     "referenced_type" : "type-2409"
-    },
-    {
-     "referenced_type" : "type-2417"
-    },
-    {
-     "referenced_type" : "type-2419"
+     "referenced_type" : "type-2420"
     },
     {
      "referenced_type" : "type-2421"
     },
     {
-     "referenced_type" : "type-2420"
+     "referenced_type" : "type-2423"
     },
     {
-     "referenced_type" : "type-2423"
+     "referenced_type" : "type-2422"
+    },
+    {
+     "referenced_type" : "type-2425"
     }
    ],
    "fields" :
@@ -24106,14 +24172,14 @@
     {
      "access" : "private",
      "field_name" : "m_value",
-     "referenced_type" : "type-2428"
+     "referenced_type" : "type-2430"
     }
    ],
    "linker_set_key" : "android::details::TMat44<float>",
    "name" : "android::details::TMat44<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2427",
-   "self_type" : "type-2427",
+   "referenced_type" : "type-2429",
+   "self_type" : "type-2429",
    "size" : 64,
    "source_file" : "/frameworks/native/libs/math/include/math/mat4.h",
    "template_args" : [ "type-10" ],
@@ -24136,8 +24202,8 @@
    "linker_set_key" : "android::details::TMatDebug<android::details::TMat44, float>",
    "name" : "android::details::TMatDebug<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2423",
-   "self_type" : "type-2423",
+   "referenced_type" : "type-2425",
+   "self_type" : "type-2425",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24160,8 +24226,8 @@
    "linker_set_key" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "name" : "android::details::TMatHelpers<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2420",
-   "self_type" : "type-2420",
+   "referenced_type" : "type-2422",
+   "self_type" : "type-2422",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24184,8 +24250,8 @@
    "linker_set_key" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "name" : "android::details::TMatProductOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2417",
-   "self_type" : "type-2417",
+   "referenced_type" : "type-2420",
+   "self_type" : "type-2420",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24208,8 +24274,8 @@
    "linker_set_key" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "name" : "android::details::TMatSquareFunctions<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2419",
-   "self_type" : "type-2419",
+   "referenced_type" : "type-2421",
+   "self_type" : "type-2421",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24232,8 +24298,8 @@
    "linker_set_key" : "android::details::TMatTransform<android::details::TMat44, float>",
    "name" : "android::details::TMatTransform<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2421",
-   "self_type" : "type-2421",
+   "referenced_type" : "type-2423",
+   "self_type" : "type-2423",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TMatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24244,11 +24310,11 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "type-51",
+   "self_type" : "type-51",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details10TQuatDebugINS0_11TQuaternionEdEE"
   },
   {
@@ -24256,8 +24322,8 @@
    "linker_set_key" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatDebug<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "type-50",
+   "self_type" : "type-50",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24268,11 +24334,11 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "type-49",
+   "self_type" : "type-49",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details14TQuatFunctionsINS0_11TQuaternionEdEE"
   },
   {
@@ -24280,8 +24346,8 @@
    "linker_set_key" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "name" : "android::details::TQuatFunctions<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "type-45",
+   "self_type" : "type-45",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
    "template_args" : [ "type-10" ],
@@ -24292,11 +24358,11 @@
    "linker_set_key" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TQuatProductOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-40",
-   "self_type" : "type-40",
+   "referenced_type" : "type-42",
+   "self_type" : "type-42",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TQuatHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details21TQuatProductOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -24316,38 +24382,38 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-334"
+     "referenced_type" : "type-331"
     },
     {
-     "referenced_type" : "type-335"
+     "referenced_type" : "type-332"
     },
     {
-     "referenced_type" : "type-336"
+     "referenced_type" : "type-333"
     },
     {
-     "referenced_type" : "type-40"
-    },
-    {
-     "referenced_type" : "type-47"
+     "referenced_type" : "type-42"
     },
     {
      "referenced_type" : "type-49"
+    },
+    {
+     "referenced_type" : "type-51"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-332"
+     "referenced_type" : "type-329"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<double>",
    "name" : "android::details::TQuaternion<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-331",
-   "self_type" : "type-331",
+   "referenced_type" : "type-328",
+   "self_type" : "type-328",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEE"
   },
   {
@@ -24355,27 +24421,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-333"
+     "referenced_type" : "type-330"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-50"
+     "referenced_type" : "type-52"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-332",
-   "self_type" : "type-332",
+   "referenced_type" : "type-329",
+   "self_type" : "type-329",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_E"
@@ -24386,29 +24452,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<double>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-333",
-   "self_type" : "type-333",
+   "referenced_type" : "type-330",
+   "self_type" : "type-330",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIdEUt_Ut_E"
@@ -24418,35 +24484,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-413"
+     "referenced_type" : "type-410"
     },
     {
-     "referenced_type" : "type-414"
+     "referenced_type" : "type-411"
     },
     {
-     "referenced_type" : "type-415"
+     "referenced_type" : "type-412"
     },
     {
      "referenced_type" : "type-38"
     },
     {
-     "referenced_type" : "type-43"
+     "referenced_type" : "type-45"
     },
     {
-     "referenced_type" : "type-48"
+     "referenced_type" : "type-50"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-411"
+     "referenced_type" : "type-408"
     }
    ],
    "linker_set_key" : "android::details::TQuaternion<float>",
    "name" : "android::details::TQuaternion<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-410",
-   "self_type" : "type-410",
+   "referenced_type" : "type-407",
+   "self_type" : "type-407",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "template_args" : [ "type-10" ],
@@ -24457,27 +24523,27 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-412"
+     "referenced_type" : "type-409"
     },
     {
      "field_name" : "xyzw",
-     "referenced_type" : "type-200"
+     "referenced_type" : "type-192"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5) at frameworks/native/libs/math/include/math/quat.h:65:5",
    "record_kind" : "union",
-   "referenced_type" : "type-411",
-   "self_type" : "type-411",
+   "referenced_type" : "type-408",
+   "self_type" : "type-408",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_E"
@@ -24509,8 +24575,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
    "name" : "android::details::TQuaternion<float>::(anonymous union at frameworks/native/libs/math/include/math/quat.h:65:5)::(anonymous struct at frameworks/native/libs/math/include/math/quat.h:66:9) at frameworks/native/libs/math/include/math/quat.h:66:9",
-   "referenced_type" : "type-412",
-   "self_type" : "type-412",
+   "referenced_type" : "type-409",
+   "self_type" : "type-409",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/quat.h",
    "unique_id" : "_ZTSN7android7details11TQuaternionIfEUt_Ut_E"
@@ -24520,16 +24586,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-396"
+     "referenced_type" : "type-390"
     },
     {
-     "referenced_type" : "type-427"
+     "referenced_type" : "type-424"
     },
     {
-     "referenced_type" : "type-462"
+     "referenced_type" : "type-455"
     },
     {
-     "referenced_type" : "type-510"
+     "referenced_type" : "type-507"
     },
     {
      "referenced_type" : "type-600"
@@ -24652,12 +24718,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-60"
-    },
-    {
-     "referenced_type" : "type-61"
-    },
-    {
      "referenced_type" : "type-62"
     },
     {
@@ -24668,22 +24728,28 @@
     },
     {
      "referenced_type" : "type-65"
+    },
+    {
+     "referenced_type" : "type-66"
+    },
+    {
+     "referenced_type" : "type-67"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-56"
+     "referenced_type" : "type-58"
     }
    ],
    "linker_set_key" : "android::details::TVec2<double>",
    "name" : "android::details::TVec2<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-55",
-   "self_type" : "type-55",
+   "referenced_type" : "type-57",
+   "self_type" : "type-57",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec2IdEE"
   },
   {
@@ -24691,21 +24757,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-57"
-    },
-    {
-     "referenced_type" : "type-58"
-    },
-    {
      "referenced_type" : "type-59"
+    },
+    {
+     "referenced_type" : "type-60"
+    },
+    {
+     "referenced_type" : "type-61"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-56",
-   "self_type" : "type-56",
+   "referenced_type" : "type-58",
+   "self_type" : "type-58",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_E"
@@ -24716,19 +24782,19 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-57",
-   "self_type" : "type-57",
+   "referenced_type" : "type-59",
+   "self_type" : "type-59",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut_E"
@@ -24739,19 +24805,19 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-58",
-   "self_type" : "type-58",
+   "referenced_type" : "type-60",
+   "self_type" : "type-60",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut0_E"
@@ -24762,19 +24828,19 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<double>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-59",
-   "self_type" : "type-59",
+   "referenced_type" : "type-61",
+   "self_type" : "type-61",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IdEUt_Ut1_E"
@@ -24784,9 +24850,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-27"
-    },
-    {
      "referenced_type" : "type-28"
     },
     {
@@ -24800,19 +24863,22 @@
     },
     {
      "referenced_type" : "type-32"
+    },
+    {
+     "referenced_type" : "type-33"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-23"
+     "referenced_type" : "type-24"
     }
    ],
    "linker_set_key" : "android::details::TVec2<float>",
    "name" : "android::details::TVec2<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-22",
-   "self_type" : "type-22",
+   "referenced_type" : "type-23",
+   "self_type" : "type-23",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "template_args" : [ "type-10" ],
@@ -24823,21 +24889,21 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-24"
-    },
-    {
      "referenced_type" : "type-25"
     },
     {
      "referenced_type" : "type-26"
+    },
+    {
+     "referenced_type" : "type-27"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5) at frameworks/native/libs/math/include/math/vec2.h:49:5",
    "record_kind" : "union",
-   "referenced_type" : "type-23",
-   "self_type" : "type-23",
+   "referenced_type" : "type-24",
+   "self_type" : "type-24",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_E"
@@ -24859,8 +24925,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:50:9) at frameworks/native/libs/math/include/math/vec2.h:50:9",
-   "referenced_type" : "type-24",
-   "self_type" : "type-24",
+   "referenced_type" : "type-25",
+   "self_type" : "type-25",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut_E"
@@ -24882,8 +24948,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:51:9) at frameworks/native/libs/math/include/math/vec2.h:51:9",
-   "referenced_type" : "type-25",
-   "self_type" : "type-25",
+   "referenced_type" : "type-26",
+   "self_type" : "type-26",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut0_E"
@@ -24905,8 +24971,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
    "name" : "android::details::TVec2<float>::(anonymous union at frameworks/native/libs/math/include/math/vec2.h:49:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec2.h:52:9) at frameworks/native/libs/math/include/math/vec2.h:52:9",
-   "referenced_type" : "type-26",
-   "self_type" : "type-26",
+   "referenced_type" : "type-27",
+   "self_type" : "type-27",
    "size" : 8,
    "source_file" : "/frameworks/native/libs/math/include/math/vec2.h",
    "unique_id" : "_ZTSN7android7details5TVec2IfEUt_Ut1_E"
@@ -24916,12 +24982,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-71"
-    },
-    {
-     "referenced_type" : "type-72"
-    },
-    {
      "referenced_type" : "type-73"
     },
     {
@@ -24932,22 +24992,28 @@
     },
     {
      "referenced_type" : "type-76"
+    },
+    {
+     "referenced_type" : "type-77"
+    },
+    {
+     "referenced_type" : "type-78"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-67"
+     "referenced_type" : "type-69"
     }
    ],
    "linker_set_key" : "android::details::TVec3<double>",
    "name" : "android::details::TVec3<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-66",
-   "self_type" : "type-66",
+   "referenced_type" : "type-68",
+   "self_type" : "type-68",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec3IdEE"
   },
   {
@@ -24955,33 +25021,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-68"
-    },
-    {
-     "referenced_type" : "type-69"
-    },
-    {
      "referenced_type" : "type-70"
     },
     {
+     "referenced_type" : "type-71"
+    },
+    {
+     "referenced_type" : "type-72"
+    },
+    {
      "field_name" : "xy",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-67",
-   "self_type" : "type-67",
+   "referenced_type" : "type-69",
+   "self_type" : "type-69",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_E"
@@ -24992,24 +25058,24 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-68",
-   "self_type" : "type-68",
+   "referenced_type" : "type-70",
+   "self_type" : "type-70",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut_E"
@@ -25020,24 +25086,24 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-69",
-   "self_type" : "type-69",
+   "referenced_type" : "type-71",
+   "self_type" : "type-71",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut0_E"
@@ -25048,24 +25114,24 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<double>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-70",
-   "self_type" : "type-70",
+   "referenced_type" : "type-72",
+   "self_type" : "type-72",
    "size" : 24,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IdEUt_Ut1_E"
@@ -25075,35 +25141,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-33"
+     "referenced_type" : "type-34"
     },
     {
-     "referenced_type" : "type-34"
+     "referenced_type" : "type-35"
     },
     {
      "referenced_type" : "type-9"
     },
     {
-     "referenced_type" : "type-11"
+     "referenced_type" : "type-13"
     },
     {
-     "referenced_type" : "type-12"
+     "referenced_type" : "type-14"
     },
     {
-     "referenced_type" : "type-35"
+     "referenced_type" : "type-36"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-18"
+     "referenced_type" : "type-19"
     }
    ],
    "linker_set_key" : "android::details::TVec3<float>",
    "name" : "android::details::TVec3<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-17",
-   "self_type" : "type-17",
+   "referenced_type" : "type-18",
+   "self_type" : "type-18",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "template_args" : [ "type-10" ],
@@ -25114,33 +25180,33 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-19"
-    },
-    {
      "referenced_type" : "type-20"
     },
     {
      "referenced_type" : "type-21"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-22"
     },
     {
+     "field_name" : "xy",
+     "referenced_type" : "type-23"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5) at frameworks/native/libs/math/include/math/vec3.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-18",
-   "self_type" : "type-18",
+   "referenced_type" : "type-19",
+   "self_type" : "type-19",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_E"
@@ -25167,8 +25233,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:48:9) at frameworks/native/libs/math/include/math/vec3.h:48:9",
-   "referenced_type" : "type-19",
-   "self_type" : "type-19",
+   "referenced_type" : "type-20",
+   "self_type" : "type-20",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut_E"
@@ -25195,8 +25261,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:49:9) at frameworks/native/libs/math/include/math/vec3.h:49:9",
-   "referenced_type" : "type-20",
-   "self_type" : "type-20",
+   "referenced_type" : "type-21",
+   "self_type" : "type-21",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut0_E"
@@ -25223,8 +25289,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
    "name" : "android::details::TVec3<float>::(anonymous union at frameworks/native/libs/math/include/math/vec3.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec3.h:50:9) at frameworks/native/libs/math/include/math/vec3.h:50:9",
-   "referenced_type" : "type-21",
-   "self_type" : "type-21",
+   "referenced_type" : "type-22",
+   "self_type" : "type-22",
    "size" : 12,
    "source_file" : "/frameworks/native/libs/math/include/math/vec3.h",
    "unique_id" : "_ZTSN7android7details5TVec3IfEUt_Ut1_E"
@@ -25234,12 +25300,6 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-77"
-    },
-    {
-     "referenced_type" : "type-78"
-    },
-    {
      "referenced_type" : "type-79"
     },
     {
@@ -25250,22 +25310,28 @@
     },
     {
      "referenced_type" : "type-82"
+    },
+    {
+     "referenced_type" : "type-83"
+    },
+    {
+     "referenced_type" : "type-84"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-51"
+     "referenced_type" : "type-53"
     }
    ],
    "linker_set_key" : "android::details::TVec4<double>",
    "name" : "android::details::TVec4<double>",
    "record_kind" : "class",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "type-52",
+   "self_type" : "type-52",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details5TVec4IdEE"
   },
   {
@@ -25273,45 +25339,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-52"
-    },
-    {
-     "referenced_type" : "type-53"
-    },
-    {
      "referenced_type" : "type-54"
     },
     {
-     "field_name" : "xy",
      "referenced_type" : "type-55"
     },
     {
+     "referenced_type" : "type-56"
+    },
+    {
+     "field_name" : "xy",
+     "referenced_type" : "type-57"
+    },
+    {
      "field_name" : "st",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-55"
+     "referenced_type" : "type-57"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-66"
+     "referenced_type" : "type-68"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-51",
-   "self_type" : "type-51",
+   "referenced_type" : "type-53",
+   "self_type" : "type-53",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_E"
@@ -25322,29 +25388,29 @@
    [
     {
      "field_name" : "x",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "y",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "z",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "w",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-52",
-   "self_type" : "type-52",
+   "referenced_type" : "type-54",
+   "self_type" : "type-54",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut_E"
@@ -25355,29 +25421,29 @@
    [
     {
      "field_name" : "s",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "t",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "p",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "q",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-53",
-   "self_type" : "type-53",
+   "referenced_type" : "type-55",
+   "self_type" : "type-55",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut0_E"
@@ -25388,29 +25454,29 @@
    [
     {
      "field_name" : "r",
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "g",
      "field_offset" : 64,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "b",
      "field_offset" : 128,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     },
     {
      "field_name" : "a",
      "field_offset" : 192,
-     "referenced_type" : "type-41"
+     "referenced_type" : "type-43"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<double>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-54",
-   "self_type" : "type-54",
+   "referenced_type" : "type-56",
+   "self_type" : "type-56",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IdEUt_Ut1_E"
@@ -25420,35 +25486,35 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-205"
+     "referenced_type" : "type-197"
     },
     {
-     "referenced_type" : "type-206"
+     "referenced_type" : "type-198"
     },
     {
-     "referenced_type" : "type-207"
+     "referenced_type" : "type-199"
     },
     {
-     "referenced_type" : "type-208"
+     "referenced_type" : "type-200"
     },
     {
-     "referenced_type" : "type-209"
+     "referenced_type" : "type-201"
     },
     {
-     "referenced_type" : "type-210"
+     "referenced_type" : "type-202"
     }
    ],
    "fields" :
    [
     {
-     "referenced_type" : "type-201"
+     "referenced_type" : "type-193"
     }
    ],
    "linker_set_key" : "android::details::TVec4<float>",
    "name" : "android::details::TVec4<float>",
    "record_kind" : "class",
-   "referenced_type" : "type-200",
-   "self_type" : "type-200",
+   "referenced_type" : "type-192",
+   "self_type" : "type-192",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "template_args" : [ "type-10" ],
@@ -25459,45 +25525,45 @@
    "fields" :
    [
     {
-     "referenced_type" : "type-202"
+     "referenced_type" : "type-194"
     },
     {
-     "referenced_type" : "type-203"
+     "referenced_type" : "type-195"
     },
     {
-     "referenced_type" : "type-204"
+     "referenced_type" : "type-196"
     },
     {
      "field_name" : "xy",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "st",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "rg",
-     "referenced_type" : "type-22"
+     "referenced_type" : "type-23"
     },
     {
      "field_name" : "xyz",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "stp",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     },
     {
      "field_name" : "rgb",
-     "referenced_type" : "type-17"
+     "referenced_type" : "type-18"
     }
    ],
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5) at frameworks/native/libs/math/include/math/vec4.h:47:5",
    "record_kind" : "union",
-   "referenced_type" : "type-201",
-   "self_type" : "type-201",
+   "referenced_type" : "type-193",
+   "self_type" : "type-193",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_E"
@@ -25529,8 +25595,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:48:9) at frameworks/native/libs/math/include/math/vec4.h:48:9",
-   "referenced_type" : "type-202",
-   "self_type" : "type-202",
+   "referenced_type" : "type-194",
+   "self_type" : "type-194",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut_E"
@@ -25562,8 +25628,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:49:9) at frameworks/native/libs/math/include/math/vec4.h:49:9",
-   "referenced_type" : "type-203",
-   "self_type" : "type-203",
+   "referenced_type" : "type-195",
+   "self_type" : "type-195",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut0_E"
@@ -25595,8 +25661,8 @@
    "is_anonymous" : true,
    "linker_set_key" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
    "name" : "android::details::TVec4<float>::(anonymous union at frameworks/native/libs/math/include/math/vec4.h:47:5)::(anonymous struct at frameworks/native/libs/math/include/math/vec4.h:50:9) at frameworks/native/libs/math/include/math/vec4.h:50:9",
-   "referenced_type" : "type-204",
-   "self_type" : "type-204",
+   "referenced_type" : "type-196",
+   "self_type" : "type-196",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/math/include/math/vec4.h",
    "unique_id" : "_ZTSN7android7details5TVec4IfEUt_Ut1_E"
@@ -25618,8 +25684,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecAddOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2409",
-   "self_type" : "type-2409",
+   "referenced_type" : "type-2411",
+   "self_type" : "type-2411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25630,11 +25696,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-334",
-   "self_type" : "type-334",
+   "referenced_type" : "type-331",
+   "self_type" : "type-331",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25642,8 +25708,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecAddOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-413",
-   "self_type" : "type-413",
+   "referenced_type" : "type-410",
+   "self_type" : "type-410",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25654,8 +25720,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-427",
-   "self_type" : "type-427",
+   "referenced_type" : "type-424",
+   "self_type" : "type-424",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25666,11 +25732,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-61",
-   "self_type" : "type-61",
+   "referenced_type" : "type-63",
+   "self_type" : "type-63",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25678,8 +25744,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "type-29",
+   "self_type" : "type-29",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25690,11 +25756,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-72",
-   "self_type" : "type-72",
+   "referenced_type" : "type-74",
+   "self_type" : "type-74",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25702,8 +25768,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-34",
-   "self_type" : "type-34",
+   "referenced_type" : "type-35",
+   "self_type" : "type-35",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25714,11 +25780,11 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-78",
-   "self_type" : "type-78",
+   "referenced_type" : "type-80",
+   "self_type" : "type-80",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details16TVecAddOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25726,8 +25792,8 @@
    "linker_set_key" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecAddOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-206",
-   "self_type" : "type-206",
+   "referenced_type" : "type-198",
+   "self_type" : "type-198",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25750,8 +25816,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2411",
-   "self_type" : "type-2411",
+   "referenced_type" : "type-2413",
+   "self_type" : "type-2413",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25762,11 +25828,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-336",
-   "self_type" : "type-336",
+   "referenced_type" : "type-333",
+   "self_type" : "type-333",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -25774,8 +25840,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-415",
-   "self_type" : "type-415",
+   "referenced_type" : "type-412",
+   "self_type" : "type-412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25786,8 +25852,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-510",
-   "self_type" : "type-510",
+   "referenced_type" : "type-507",
+   "self_type" : "type-507",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -25798,11 +25864,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-63",
-   "self_type" : "type-63",
+   "referenced_type" : "type-65",
+   "self_type" : "type-65",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -25810,8 +25876,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "type-31",
+   "self_type" : "type-31",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25822,11 +25888,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-74",
-   "self_type" : "type-74",
+   "referenced_type" : "type-76",
+   "self_type" : "type-76",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -25834,8 +25900,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-11",
-   "self_type" : "type-11",
+   "referenced_type" : "type-13",
+   "self_type" : "type-13",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25846,11 +25912,11 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-80",
-   "self_type" : "type-80",
+   "referenced_type" : "type-82",
+   "self_type" : "type-82",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details23TVecComparisonOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -25858,8 +25924,8 @@
    "linker_set_key" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecComparisonOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-208",
-   "self_type" : "type-208",
+   "referenced_type" : "type-200",
+   "self_type" : "type-200",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25882,11 +25948,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, double>",
    "name" : "android::details::TVecDebug<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-65",
-   "self_type" : "type-65",
+   "referenced_type" : "type-67",
+   "self_type" : "type-67",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec2EdEE"
   },
   {
@@ -25894,8 +25960,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec2, float>",
    "name" : "android::details::TVecDebug<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-32",
-   "self_type" : "type-32",
+   "referenced_type" : "type-33",
+   "self_type" : "type-33",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25906,11 +25972,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, double>",
    "name" : "android::details::TVecDebug<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-76",
-   "self_type" : "type-76",
+   "referenced_type" : "type-78",
+   "self_type" : "type-78",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec3EdEE"
   },
   {
@@ -25918,8 +25984,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec3, float>",
    "name" : "android::details::TVecDebug<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-35",
-   "self_type" : "type-35",
+   "referenced_type" : "type-36",
+   "self_type" : "type-36",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25930,11 +25996,11 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, double>",
    "name" : "android::details::TVecDebug<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-82",
-   "self_type" : "type-82",
+   "referenced_type" : "type-84",
+   "self_type" : "type-84",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details9TVecDebugINS0_5TVec4EdEE"
   },
   {
@@ -25942,8 +26008,8 @@
    "linker_set_key" : "android::details::TVecDebug<android::details::TVec4, float>",
    "name" : "android::details::TVecDebug<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-210",
-   "self_type" : "type-210",
+   "referenced_type" : "type-202",
+   "self_type" : "type-202",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25966,11 +26032,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-64",
-   "self_type" : "type-64",
+   "referenced_type" : "type-66",
+   "self_type" : "type-66",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec2EdEE"
   },
   {
@@ -25978,8 +26044,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "type-32",
+   "self_type" : "type-32",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -25990,11 +26056,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-75",
-   "self_type" : "type-75",
+   "referenced_type" : "type-77",
+   "self_type" : "type-77",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec3EdEE"
   },
   {
@@ -26002,8 +26068,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "type-14",
+   "self_type" : "type-14",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26014,11 +26080,11 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-81",
-   "self_type" : "type-81",
+   "referenced_type" : "type-83",
+   "self_type" : "type-83",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details13TVecFunctionsINS0_5TVec4EdEE"
   },
   {
@@ -26026,8 +26092,8 @@
    "linker_set_key" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "name" : "android::details::TVecFunctions<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-209",
-   "self_type" : "type-209",
+   "referenced_type" : "type-201",
+   "self_type" : "type-201",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26038,8 +26104,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-396",
-   "self_type" : "type-396",
+   "referenced_type" : "type-390",
+   "self_type" : "type-390",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26050,11 +26116,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-60",
-   "self_type" : "type-60",
+   "referenced_type" : "type-62",
+   "self_type" : "type-62",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26062,8 +26128,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "type-28",
+   "self_type" : "type-28",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26074,11 +26140,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-71",
-   "self_type" : "type-71",
+   "referenced_type" : "type-73",
+   "self_type" : "type-73",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26086,8 +26152,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec3, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "type-34",
+   "self_type" : "type-34",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26098,11 +26164,11 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-77",
-   "self_type" : "type-77",
+   "referenced_type" : "type-79",
+   "self_type" : "type-79",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details20TVecProductOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26110,8 +26176,8 @@
    "linker_set_key" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecProductOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-205",
-   "self_type" : "type-205",
+   "referenced_type" : "type-197",
+   "self_type" : "type-197",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26134,8 +26200,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TMat44, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-2410",
-   "self_type" : "type-2410",
+   "referenced_type" : "type-2412",
+   "self_type" : "type-2412",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26146,11 +26212,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-335",
-   "self_type" : "type-335",
+   "referenced_type" : "type-332",
+   "self_type" : "type-332",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_11TQuaternionEdEE"
   },
   {
@@ -26158,8 +26224,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TQuaternion, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-414",
-   "self_type" : "type-414",
+   "referenced_type" : "type-411",
+   "self_type" : "type-411",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26170,8 +26236,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, bool>",
    "record_kind" : "class",
-   "referenced_type" : "type-462",
-   "self_type" : "type-462",
+   "referenced_type" : "type-455",
+   "self_type" : "type-455",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-6" ],
@@ -26182,11 +26248,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-62",
-   "self_type" : "type-62",
+   "referenced_type" : "type-64",
+   "self_type" : "type-64",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec2EdEE"
   },
   {
@@ -26194,8 +26260,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec2, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29",
+   "referenced_type" : "type-30",
+   "self_type" : "type-30",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26206,11 +26272,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec3, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-73",
-   "self_type" : "type-73",
+   "referenced_type" : "type-75",
+   "self_type" : "type-75",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec3EdEE"
   },
   {
@@ -26230,11 +26296,11 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, double>",
    "record_kind" : "class",
-   "referenced_type" : "type-79",
-   "self_type" : "type-79",
+   "referenced_type" : "type-81",
+   "self_type" : "type-81",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android7details18TVecUnaryOperatorsINS0_5TVec4EdEE"
   },
   {
@@ -26242,8 +26308,8 @@
    "linker_set_key" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "name" : "android::details::TVecUnaryOperators<android::details::TVec4, float>",
    "record_kind" : "class",
-   "referenced_type" : "type-207",
-   "self_type" : "type-207",
+   "referenced_type" : "type-199",
+   "self_type" : "type-199",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/TVecHelpers.h",
    "template_args" : [ "type-10" ],
@@ -26309,7 +26375,7 @@
    [
     {
      "field_name" : "bits",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fp",
@@ -26331,7 +26397,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-196"
+     "referenced_type" : "type-209"
     }
    ],
    "fields" :
@@ -26340,32 +26406,32 @@
      "access" : "protected",
      "field_name" : "mSchedPolicy",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "protected",
      "field_name" : "mSchedPriority",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mExtras",
      "field_offset" : 96,
-     "referenced_type" : "type-243"
+     "referenced_type" : "type-245"
     },
     {
      "access" : "private",
      "field_name" : "mReserved0",
      "field_offset" : 128,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::BHwBinder",
    "name" : "android::hardware::BHwBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-242",
-   "self_type" : "type-242",
+   "referenced_type" : "type-244",
+   "self_type" : "type-244",
    "size" : 28,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware9BHwBinderE",
@@ -26472,7 +26538,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -26481,26 +26547,26 @@
      "access" : "private",
      "field_name" : "mRemote",
      "field_offset" : 32,
-     "referenced_type" : "type-194"
+     "referenced_type" : "type-207"
     },
     {
      "access" : "private",
      "field_name" : "mRefs",
      "field_offset" : 64,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     },
     {
      "access" : "private",
      "field_name" : "mState",
      "field_offset" : 96,
-     "referenced_type" : "type-199"
+     "referenced_type" : "type-212"
     }
    ],
    "linker_set_key" : "android::hardware::BpHwRefBase",
    "name" : "android::hardware::BpHwRefBase",
    "record_kind" : "class",
-   "referenced_type" : "type-193",
-   "self_type" : "type-193",
+   "referenced_type" : "type-206",
+   "self_type" : "type-206",
    "size" : 24,
    "source_file" : "/system/libhwbinder/include/hwbinder/Binder.h",
    "unique_id" : "_ZTSN7android8hardware11BpHwRefBaseE",
@@ -26589,22 +26655,22 @@
    [
     {
      "field_name" : "flags",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "fdIndex",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "offset",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "extent",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::GrantorDescriptor",
@@ -26625,7 +26691,7 @@
     },
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::HidlMemory",
@@ -26713,14 +26779,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder",
    "name" : "android::hardware::IBinder",
    "record_kind" : "class",
-   "referenced_type" : "type-196",
-   "self_type" : "type-196",
+   "referenced_type" : "type-209",
+   "self_type" : "type-209",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinderE",
@@ -26830,14 +26896,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IBinder::DeathRecipient",
    "name" : "android::hardware::IBinder::DeathRecipient",
    "record_kind" : "class",
-   "referenced_type" : "type-192",
-   "self_type" : "type-192",
+   "referenced_type" : "type-205",
+   "self_type" : "type-205",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IBinder.h",
    "unique_id" : "_ZTSN7android8hardware7IBinder14DeathRecipientE",
@@ -26918,14 +26984,14 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::IInterface",
    "name" : "android::hardware::IInterface",
    "record_kind" : "class",
-   "referenced_type" : "type-213",
-   "self_type" : "type-213",
+   "referenced_type" : "type-215",
+   "self_type" : "type-215",
    "size" : 12,
    "source_file" : "/system/libhwbinder/include/hwbinder/IInterface.h",
    "unique_id" : "_ZTSN7android8hardware10IInterfaceE",
@@ -27007,85 +27073,85 @@
     {
      "access" : "private",
      "field_name" : "mProcess",
-     "referenced_type" : "type-278"
+     "referenced_type" : "type-274"
     },
     {
      "access" : "private",
      "field_name" : "mPendingStrongDerefs",
      "field_offset" : 32,
-     "referenced_type" : "type-240"
+     "referenced_type" : "type-242"
     },
     {
      "access" : "private",
      "field_name" : "mPendingWeakDerefs",
      "field_offset" : 192,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteStrongDerefs",
      "field_offset" : 352,
-     "referenced_type" : "type-245"
+     "referenced_type" : "type-247"
     },
     {
      "access" : "private",
      "field_name" : "mPostWriteWeakDerefs",
      "field_offset" : 512,
-     "referenced_type" : "type-244"
+     "referenced_type" : "type-246"
     },
     {
      "access" : "private",
      "field_name" : "mIn",
      "field_offset" : 672,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mOut",
      "field_offset" : 1216,
-     "referenced_type" : "type-215"
+     "referenced_type" : "type-217"
     },
     {
      "access" : "private",
      "field_name" : "mLastError",
      "field_offset" : 1760,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingPid",
      "field_offset" : 1792,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mCallingSid",
      "field_offset" : 1824,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "access" : "private",
      "field_name" : "mCallingUid",
      "field_offset" : 1856,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStrictModePolicy",
      "field_offset" : 1888,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mLastTransactionBinderFlags",
      "field_offset" : 1920,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mContextObject",
      "field_offset" : 1952,
-     "referenced_type" : "type-289"
+     "referenced_type" : "type-286"
     },
     {
      "access" : "private",
@@ -27103,26 +27169,26 @@
      "access" : "private",
      "field_name" : "mPostCommandTasks",
      "field_offset" : 2016,
-     "referenced_type" : "type-290"
+     "referenced_type" : "type-287"
     },
     {
      "access" : "private",
      "field_name" : "mIPCThreadStateBase",
      "field_offset" : 2112,
-     "referenced_type" : "type-291"
+     "referenced_type" : "type-288"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 2144,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::IPCThreadState",
    "name" : "android::hardware::IPCThreadState",
    "record_kind" : "class",
-   "referenced_type" : "type-277",
-   "self_type" : "type-277",
+   "referenced_type" : "type-273",
+   "self_type" : "type-273",
    "size" : 272,
    "source_file" : "/system/libhwbinder/include/hwbinder/IPCThreadState.h",
    "unique_id" : "_ZTSN7android8hardware14IPCThreadStateE"
@@ -27134,73 +27200,73 @@
     {
      "access" : "private",
      "field_name" : "mBufCachePos",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mBufCache",
      "field_offset" : 32,
-     "referenced_type" : "type-216"
+     "referenced_type" : "type-218"
     },
     {
      "access" : "private",
      "field_name" : "mError",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mData",
      "field_offset" : 160,
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "access" : "private",
      "field_name" : "mDataSize",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataCapacity",
      "field_offset" : 224,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mDataPos",
      "field_offset" : 256,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjects",
      "field_offset" : 288,
-     "referenced_type" : "type-219"
+     "referenced_type" : "type-221"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsSize",
      "field_offset" : 320,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mObjectsCapacity",
      "field_offset" : 352,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNextObjectHint",
      "field_offset" : 384,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mNumRef",
      "field_offset" : 416,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -27224,20 +27290,20 @@
      "access" : "private",
      "field_name" : "mOwner",
      "field_offset" : 480,
-     "referenced_type" : "type-220"
+     "referenced_type" : "type-222"
     },
     {
      "access" : "private",
      "field_name" : "mOwnerCookie",
      "field_offset" : 512,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel",
    "name" : "android::hardware::Parcel",
    "record_kind" : "class",
-   "referenced_type" : "type-215",
-   "self_type" : "type-215",
+   "referenced_type" : "type-217",
+   "self_type" : "type-217",
    "size" : 68,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6ParcelE"
@@ -27249,23 +27315,23 @@
    [
     {
      "field_name" : "index",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "buffer",
      "field_offset" : 32,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "bufend",
      "field_offset" : 96,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "linker_set_key" : "android::hardware::Parcel::BufferInfo",
    "name" : "android::hardware::Parcel::BufferInfo",
-   "referenced_type" : "type-228",
-   "self_type" : "type-228",
+   "referenced_type" : "type-230",
+   "self_type" : "type-230",
    "size" : 20,
    "source_file" : "/system/libhwbinder/include/hwbinder/Parcel.h",
    "unique_id" : "_ZTSN7android8hardware6Parcel10BufferInfoE"
@@ -27276,7 +27342,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "fields" :
@@ -27285,55 +27351,55 @@
      "access" : "private",
      "field_name" : "mDriverFD",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mVMStart",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountLock",
      "field_offset" : 96,
-     "referenced_type" : "type-282"
+     "referenced_type" : "type-278"
     },
     {
      "access" : "private",
      "field_name" : "mThreadCountDecrement",
      "field_offset" : 128,
-     "referenced_type" : "type-283"
+     "referenced_type" : "type-279"
     },
     {
      "access" : "private",
      "field_name" : "mExecutingThreadsCount",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mMaxThreads",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
      "field_name" : "mStarvationStartTimeMs",
      "field_offset" : 224,
-     "referenced_type" : "type-284"
+     "referenced_type" : "type-12"
     },
     {
      "access" : "private",
      "field_name" : "mLock",
      "field_offset" : 288,
-     "referenced_type" : "type-252"
+     "referenced_type" : "type-280"
     },
     {
      "access" : "private",
      "field_name" : "mHandleToObject",
      "field_offset" : 320,
-     "referenced_type" : "type-238"
+     "referenced_type" : "type-240"
     },
     {
      "access" : "private",
@@ -27345,25 +27411,25 @@
      "access" : "private",
      "field_name" : "mBinderContextCheckFunc",
      "field_offset" : 512,
-     "referenced_type" : "type-274"
+     "referenced_type" : "type-270"
     },
     {
      "access" : "private",
      "field_name" : "mBinderContextUserData",
      "field_offset" : 544,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "access" : "private",
      "field_name" : "mContexts",
      "field_offset" : 576,
-     "referenced_type" : "type-247"
+     "referenced_type" : "type-249"
     },
     {
      "access" : "private",
      "field_name" : "mRootDir",
      "field_offset" : 736,
-     "referenced_type" : "type-285"
+     "referenced_type" : "type-282"
     },
     {
      "access" : "private",
@@ -27381,26 +27447,26 @@
      "access" : "private",
      "field_name" : "mThreadPoolSeq",
      "field_offset" : 800,
-     "referenced_type" : "type-275"
+     "referenced_type" : "type-271"
     },
     {
      "access" : "private",
      "field_name" : "mMmapSize",
      "field_offset" : 832,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "access" : "private",
      "field_name" : "mCallRestriction",
      "field_offset" : 864,
-     "referenced_type" : "type-276"
+     "referenced_type" : "type-272"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState",
    "name" : "android::hardware::ProcessState",
    "record_kind" : "class",
-   "referenced_type" : "type-281",
-   "self_type" : "type-281",
+   "referenced_type" : "type-277",
+   "self_type" : "type-277",
    "size" : 120,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessStateE",
@@ -27478,18 +27544,18 @@
    [
     {
      "field_name" : "binder",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     },
     {
      "field_name" : "refs",
      "field_offset" : 32,
-     "referenced_type" : "type-197"
+     "referenced_type" : "type-210"
     }
    ],
    "linker_set_key" : "android::hardware::ProcessState::handle_entry",
    "name" : "android::hardware::ProcessState::handle_entry",
-   "referenced_type" : "type-239",
-   "self_type" : "type-239",
+   "referenced_type" : "type-241",
+   "self_type" : "type-241",
    "size" : 8,
    "source_file" : "/system/libhwbinder/include/hwbinder/ProcessState.h",
    "unique_id" : "_ZTSN7android8hardware12ProcessState12handle_entryE"
@@ -27499,7 +27565,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27508,17 +27574,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-100"
+     "referenced_type" : "type-102"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-99",
-   "self_type" : "type-99",
+   "referenced_type" : "type-101",
+   "self_type" : "type-101",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-105" ],
+   "template_args" : [ "type-107" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V2_05ErrorEEE"
   },
   {
@@ -27526,7 +27592,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27535,17 +27601,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-394"
+     "referenced_type" : "type-393"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error>",
    "record_kind" : "class",
-   "referenced_type" : "type-393",
-   "self_type" : "type-393",
+   "referenced_type" : "type-392",
+   "self_type" : "type-392",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-395" ],
+   "template_args" : [ "type-394" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS0_8graphics6mapper4V3_05ErrorEEE"
   },
   {
@@ -27553,7 +27619,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "fields" :
@@ -27562,17 +27628,17 @@
      "access" : "private",
      "field_name" : "mVal",
      "field_offset" : 192,
-     "referenced_type" : "type-86"
+     "referenced_type" : "type-88"
     }
    ],
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> >",
    "record_kind" : "class",
-   "referenced_type" : "type-111",
-   "self_type" : "type-111",
+   "referenced_type" : "type-113",
+   "self_type" : "type-113",
    "size" : 28,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-86" ],
+   "template_args" : [ "type-88" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnINS_2spINS0_8graphics6mapper4V2_17IMapperEEEEE"
   },
   {
@@ -27580,7 +27646,7 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-101"
+     "referenced_type" : "type-103"
     }
    ],
    "linker_set_key" : "android::hardware::Return<void>",
@@ -27590,7 +27656,7 @@
    "self_type" : "type-1322",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android8hardware6ReturnIvEE"
   },
   {
@@ -27600,26 +27666,26 @@
     {
      "access" : "private",
      "field_name" : "mException",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mErrorCode",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "access" : "private",
      "field_name" : "mMessage",
      "field_offset" : 64,
-     "referenced_type" : "type-104"
+     "referenced_type" : "type-106"
     }
    ],
    "linker_set_key" : "android::hardware::Status",
    "name" : "android::hardware::Status",
    "record_kind" : "class",
-   "referenced_type" : "type-102",
-   "self_type" : "type-102",
+   "referenced_type" : "type-104",
+   "self_type" : "type-104",
    "size" : 20,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware6StatusE"
@@ -27725,7 +27791,7 @@
    "self_type" : "type-1103",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details14const_accessorIjLj10EJEEE"
   },
   {
@@ -27739,12 +27805,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1099",
    "self_type" : "type-1099",
@@ -27776,16 +27842,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-137"
+     "referenced_type" : "type-140"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
    "name" : "android::hardware::details::hidl_pointer<android::hardware::hidl_handle>",
-   "referenced_type" : "type-136",
-   "self_type" : "type-136",
+   "referenced_type" : "type-139",
+   "self_type" : "type-139",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEE"
   },
   {
@@ -27803,7 +27869,7 @@
    "self_type" : "type-1071",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-287" ],
+   "template_args" : [ "type-284" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIKcEE"
   },
   {
@@ -27813,16 +27879,16 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1072",
    "self_type" : "type-1072",
@@ -27836,16 +27902,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-141"
+     "referenced_type" : "type-144"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<const native_handle>",
    "name" : "android::hardware::details::hidl_pointer<const native_handle>",
-   "referenced_type" : "type-140",
-   "self_type" : "type-140",
+   "referenced_type" : "type-143",
+   "self_type" : "type-143",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-143" ],
+   "template_args" : [ "type-146" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEE"
   },
   {
@@ -27855,19 +27921,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-141",
-   "self_type" : "type-141",
+   "referenced_type" : "type-144",
+   "self_type" : "type-144",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIK13native_handleEUt_E"
@@ -27879,19 +27945,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-138"
+     "referenced_type" : "type-141"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<hidl_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<hidl_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<hidl_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<hidl_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-137",
-   "self_type" : "type-137",
+   "referenced_type" : "type-140",
+   "self_type" : "type-140",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerINS0_11hidl_handleEEUt_E"
@@ -27911,7 +27977,7 @@
    "self_type" : "type-1150",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-144" ],
+   "template_args" : [ "type-147" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerI13native_handleEE"
   },
   {
@@ -27925,12 +27991,12 @@
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "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-1151",
    "self_type" : "type-1151",
@@ -27944,16 +28010,16 @@
    [
     {
      "access" : "private",
-     "referenced_type" : "type-121"
+     "referenced_type" : "type-123"
     }
    ],
    "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned int>",
    "name" : "android::hardware::details::hidl_pointer<unsigned int>",
-   "referenced_type" : "type-120",
-   "self_type" : "type-120",
+   "referenced_type" : "type-122",
+   "self_type" : "type-122",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEE"
   },
   {
@@ -27963,19 +28029,19 @@
    [
     {
      "field_name" : "mPointer",
-     "referenced_type" : "type-122"
+     "referenced_type" : "type-124"
     },
     {
      "field_name" : "_pad",
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     }
    ],
    "is_anonymous" : true,
-   "linker_set_key" : "android::hardware::details::hidl_pointer<unsigned 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<unsigned 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<unsigned 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<unsigned 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-121",
-   "self_type" : "type-121",
+   "referenced_type" : "type-123",
+   "self_type" : "type-123",
    "size" : 8,
    "source_file" : "/system/libhidl/base/include/hidl/HidlInternal.h",
    "unique_id" : "_ZTSN7android8hardware7details12hidl_pointerIjEUt_E"
@@ -27997,7 +28063,7 @@
     {
      "access" : "private",
      "field_name" : "mStatus",
-     "referenced_type" : "type-102"
+     "referenced_type" : "type-104"
     },
     {
      "access" : "private",
@@ -28009,8 +28075,8 @@
    "linker_set_key" : "android::hardware::details::return_status",
    "name" : "android::hardware::details::return_status",
    "record_kind" : "class",
-   "referenced_type" : "type-101",
-   "self_type" : "type-101",
+   "referenced_type" : "type-103",
+   "self_type" : "type-103",
    "size" : 24,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h",
    "unique_id" : "_ZTSN7android8hardware7details13return_statusE"
@@ -28023,7 +28089,7 @@
    "self_type" : "type-1102",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware7details9std_arrayIjLj10EJEEE"
   },
   {
@@ -28037,7 +28103,7 @@
     {
      "field_name" : "nativeHandle",
      "field_offset" : 320,
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     }
    ],
    "linker_set_key" : "android::hardware::graphics::common::V1_2::HardwareBuffer",
@@ -28064,7 +28130,7 @@
    "self_type" : "type-1108",
    "size" : 40,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware10hidl_arrayIjLj10EJEEE"
   },
   {
@@ -28073,7 +28139,7 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hardware::hidl_death_recipient",
@@ -28158,33 +28224,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_0::BufferUsage, void>",
-   "referenced_type" : "type-149",
-   "self_type" : "type-149",
+   "referenced_type" : "type-152",
+   "self_type" : "type-152",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-150", "type-151" ],
+   "template_args" : [ "type-153", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_011BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_1::BufferUsage, void>",
-   "referenced_type" : "type-157",
-   "self_type" : "type-157",
+   "referenced_type" : "type-159",
+   "self_type" : "type-159",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-158", "type-151" ],
+   "template_args" : [ "type-160", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_111BufferUsageEvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
    "name" : "android::hardware::hidl_enum_range<android::hardware::graphics::common::V1_2::BufferUsage, void>",
-   "referenced_type" : "type-419",
-   "self_type" : "type-419",
+   "referenced_type" : "type-416",
+   "self_type" : "type-416",
    "size" : 1,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-420", "type-151" ],
+   "template_args" : [ "type-417", "type-154" ],
    "unique_id" : "_ZTSN7android8hardware15hidl_enum_rangeINS0_8graphics6common4V1_211BufferUsageEvEE"
   },
   {
@@ -28194,7 +28260,7 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-140"
+     "referenced_type" : "type-143"
     },
     {
      "access" : "private",
@@ -28205,8 +28271,8 @@
    ],
    "linker_set_key" : "android::hardware::hidl_handle",
    "name" : "android::hardware::hidl_handle",
-   "referenced_type" : "type-139",
-   "self_type" : "type-139",
+   "referenced_type" : "type-142",
+   "self_type" : "type-142",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
    "unique_id" : "_ZTSN7android8hardware11hidl_handleE"
@@ -28218,13 +28284,13 @@
     {
      "access" : "private",
      "field_name" : "mHandle",
-     "referenced_type" : "type-139"
+     "referenced_type" : "type-142"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 128,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "access" : "private",
@@ -28254,7 +28320,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28284,7 +28350,7 @@
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28309,13 +28375,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-136"
+     "referenced_type" : "type-139"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28326,11 +28392,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
    "name" : "android::hardware::hidl_vec<android::hardware::hidl_handle>",
-   "referenced_type" : "type-135",
-   "self_type" : "type-135",
+   "referenced_type" : "type-138",
+   "self_type" : "type-138",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-139" ],
+   "template_args" : [ "type-142" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecINS0_11hidl_handleEEE"
   },
   {
@@ -28340,13 +28406,13 @@
     {
      "access" : "private",
      "field_name" : "mBuffer",
-     "referenced_type" : "type-120"
+     "referenced_type" : "type-122"
     },
     {
      "access" : "private",
      "field_name" : "mSize",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "access" : "private",
@@ -28357,11 +28423,11 @@
    ],
    "linker_set_key" : "android::hardware::hidl_vec<unsigned int>",
    "name" : "android::hardware::hidl_vec<unsigned int>",
-   "referenced_type" : "type-128",
-   "self_type" : "type-128",
+   "referenced_type" : "type-131",
+   "self_type" : "type-131",
    "size" : 16,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android8hardware8hidl_vecIjEE"
   },
   {
@@ -28394,23 +28460,23 @@
    [
     {
      "field_name" : "pid",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "ptr",
      "field_offset" : 64,
-     "referenced_type" : "type-124"
+     "referenced_type" : "type-126"
     },
     {
      "field_name" : "arch",
      "field_offset" : 128,
-     "referenced_type" : "type-164"
+     "referenced_type" : "type-167"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::DebugInfo",
    "name" : "android::hidl::base::V1_0::DebugInfo",
-   "referenced_type" : "type-163",
-   "self_type" : "type-163",
+   "referenced_type" : "type-166",
+   "self_type" : "type-166",
    "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"
@@ -28421,13 +28487,13 @@
    [
     {
      "is_virtual" : true,
-     "referenced_type" : "type-172"
+     "referenced_type" : "type-175"
     }
    ],
    "linker_set_key" : "android::hidl::base::V1_0::IBase",
    "name" : "android::hidl::base::V1_0::IBase",
-   "referenced_type" : "type-171",
-   "self_type" : "type-171",
+   "referenced_type" : "type-174",
+   "self_type" : "type-174",
    "size" : 12,
    "source_file" : "/out/soong/.intermediates/system/libhidl/transport/base/1.0/android.hidl.base@1.0_genc++_headers/gen/android/hidl/base/1.0/IBase.h",
    "unique_id" : "_ZTSN7android4hidl4base4V1_05IBaseE",
@@ -28536,13 +28602,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-171"
+     "referenced_type" : "type-174"
     }
    ],
    "linker_set_key" : "android::hidl::manager::V1_0::IServiceNotification",
    "name" : "android::hidl::manager::V1_0::IServiceNotification",
-   "referenced_type" : "type-295",
-   "self_type" : "type-295",
+   "referenced_type" : "type-292",
+   "self_type" : "type-292",
    "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",
@@ -28656,12 +28722,12 @@
    [
     {
      "field_name" : "key",
-     "referenced_type" : "type-142"
+     "referenced_type" : "type-145"
     },
     {
      "field_name" : "value",
      "field_offset" : 32,
-     "referenced_type" : "type-676"
+     "referenced_type" : "type-680"
     }
    ],
    "linker_set_key" : "android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t>",
@@ -28670,7 +28736,7 @@
    "self_type" : "type-694",
    "size" : 48,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142", "type-676" ],
+   "template_args" : [ "type-145", "type-680" ],
    "unique_id" : "_ZTSN7android16key_value_pair_tIPK13native_handleNS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -28700,17 +28766,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-680"
+     "referenced_type" : "type-679"
     }
    ],
    "linker_set_key" : "android::sp<android::GraphicBuffer>",
    "name" : "android::sp<android::GraphicBuffer>",
    "record_kind" : "class",
-   "referenced_type" : "type-679",
-   "self_type" : "type-679",
+   "referenced_type" : "type-678",
+   "self_type" : "type-678",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-525" ],
+   "template_args" : [ "type-523" ],
    "unique_id" : "_ZTSN7android2spINS_13GraphicBufferEEE"
   },
   {
@@ -28720,17 +28786,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-368"
+     "referenced_type" : "type-365"
     }
    ],
    "linker_set_key" : "android::sp<android::Thread>",
    "name" : "android::sp<android::Thread>",
    "record_kind" : "class",
-   "referenced_type" : "type-367",
-   "self_type" : "type-367",
+   "referenced_type" : "type-364",
+   "self_type" : "type-364",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-369" ],
+   "template_args" : [ "type-366" ],
    "unique_id" : "_ZTSN7android2spINS_6ThreadEEE"
   },
   {
@@ -28740,17 +28806,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-241"
+     "referenced_type" : "type-243"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::BHwBinder>",
    "name" : "android::sp<android::hardware::BHwBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-289",
-   "self_type" : "type-289",
+   "referenced_type" : "type-286",
+   "self_type" : "type-286",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-242" ],
+   "template_args" : [ "type-244" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware9BHwBinderEEE"
   },
   {
@@ -28760,17 +28826,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-195"
+     "referenced_type" : "type-208"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::IBinder>",
    "name" : "android::sp<android::hardware::IBinder>",
    "record_kind" : "class",
-   "referenced_type" : "type-248",
-   "self_type" : "type-248",
+   "referenced_type" : "type-250",
+   "self_type" : "type-250",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-196" ],
+   "template_args" : [ "type-209" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware7IBinderEEE"
   },
   {
@@ -28780,17 +28846,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-280"
+     "referenced_type" : "type-276"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::ProcessState>",
    "name" : "android::sp<android::hardware::ProcessState>",
    "record_kind" : "class",
-   "referenced_type" : "type-279",
-   "self_type" : "type-279",
+   "referenced_type" : "type-275",
+   "self_type" : "type-275",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-281" ],
+   "template_args" : [ "type-277" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware12ProcessStateEEE"
   },
   {
@@ -28800,17 +28866,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-356"
+     "referenced_type" : "type-353"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-355",
-   "self_type" : "type-355",
+   "referenced_type" : "type-352",
+   "self_type" : "type-352",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-358" ],
+   "template_args" : [ "type-355" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V2_010IAllocatorEEE"
   },
   {
@@ -28820,17 +28886,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-485"
+     "referenced_type" : "type-482"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator>",
    "record_kind" : "class",
-   "referenced_type" : "type-484",
-   "self_type" : "type-484",
+   "referenced_type" : "type-481",
+   "self_type" : "type-481",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-487" ],
+   "template_args" : [ "type-484" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics9allocator4V3_010IAllocatorEEE"
   },
   {
@@ -28840,17 +28906,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-339"
+     "referenced_type" : "type-336"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-338",
-   "self_type" : "type-338",
+   "referenced_type" : "type-335",
+   "self_type" : "type-335",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-341" ],
+   "template_args" : [ "type-338" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_07IMapperEEE"
   },
   {
@@ -28860,17 +28926,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-87"
+     "referenced_type" : "type-89"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-86",
-   "self_type" : "type-86",
+   "referenced_type" : "type-88",
+   "self_type" : "type-88",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-89" ],
+   "template_args" : [ "type-91" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V2_17IMapperEEE"
   },
   {
@@ -28880,17 +28946,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-498"
+     "referenced_type" : "type-495"
     }
    ],
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper>",
    "record_kind" : "class",
-   "referenced_type" : "type-497",
-   "self_type" : "type-497",
+   "referenced_type" : "type-494",
+   "self_type" : "type-494",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-500" ],
+   "template_args" : [ "type-497" ],
    "unique_id" : "_ZTSN7android2spINS_8hardware8graphics6mapper4V3_07IMapperEEE"
   },
   {
@@ -28920,17 +28986,17 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-364"
+     "referenced_type" : "type-361"
     }
    ],
    "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-363",
-   "self_type" : "type-363",
+   "referenced_type" : "type-360",
+   "self_type" : "type-360",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-171" ],
+   "template_args" : [ "type-174" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl4base4V1_05IBaseEEE"
   },
   {
@@ -28940,36 +29006,36 @@
     {
      "access" : "private",
      "field_name" : "m_ptr",
-     "referenced_type" : "type-372"
+     "referenced_type" : "type-369"
     }
    ],
    "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-371",
-   "self_type" : "type-371",
+   "referenced_type" : "type-368",
+   "self_type" : "type-368",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h",
-   "template_args" : [ "type-295" ],
+   "template_args" : [ "type-292" ],
    "unique_id" : "_ZTSN7android2spINS_4hidl7manager4V1_020IServiceNotificationEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_pointer<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-819",
-   "self_type" : "type-819",
+   "referenced_type" : "type-820",
+   "self_type" : "type-820",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android13trait_pointerINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::Rect>",
    "name" : "android::trait_pointer<android::Rect>",
-   "referenced_type" : "type-2400",
-   "self_type" : "type-2400",
+   "referenced_type" : "type-2402",
+   "self_type" : "type-2402",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -28979,8 +29045,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_pointer<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-817",
-   "self_type" : "type-817",
+   "referenced_type" : "type-818",
+   "self_type" : "type-818",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -28990,33 +29056,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<const native_handle *>",
    "name" : "android::trait_pointer<const native_handle *>",
-   "referenced_type" : "type-818",
-   "self_type" : "type-818",
+   "referenced_type" : "type-819",
+   "self_type" : "type-819",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android13trait_pointerIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_pointer<long long>",
    "name" : "android::trait_pointer<long long>",
-   "referenced_type" : "type-1430",
-   "self_type" : "type-1430",
+   "referenced_type" : "type-1434",
+   "self_type" : "type-1434",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android13trait_pointerIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_copy<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-812",
-   "self_type" : "type-812",
+   "referenced_type" : "type-813",
+   "self_type" : "type-813",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29045,8 +29111,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_copy<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-813",
-   "self_type" : "type-813",
+   "referenced_type" : "type-814",
+   "self_type" : "type-814",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29056,8 +29122,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<bool>",
    "name" : "android::trait_trivial_copy<bool>",
-   "referenced_type" : "type-483",
-   "self_type" : "type-483",
+   "referenced_type" : "type-480",
+   "self_type" : "type-480",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29067,11 +29133,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<char>",
    "name" : "android::trait_trivial_copy<char>",
-   "referenced_type" : "type-512",
-   "self_type" : "type-512",
+   "referenced_type" : "type-509",
+   "self_type" : "type-509",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIcEE"
   },
   {
@@ -29082,26 +29148,26 @@
    "self_type" : "type-811",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<double>",
    "name" : "android::trait_trivial_copy<double>",
-   "referenced_type" : "type-795",
-   "self_type" : "type-795",
+   "referenced_type" : "type-787",
+   "self_type" : "type-787",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIdEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<float>",
    "name" : "android::trait_trivial_copy<float>",
-   "referenced_type" : "type-757",
-   "self_type" : "type-757",
+   "referenced_type" : "type-755",
+   "self_type" : "type-755",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-10" ],
@@ -29111,11 +29177,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<int>",
    "name" : "android::trait_trivial_copy<int>",
-   "referenced_type" : "type-647",
-   "self_type" : "type-647",
+   "referenced_type" : "type-645",
+   "self_type" : "type-645",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIiEE"
   },
   {
@@ -29126,26 +29192,26 @@
    "self_type" : "type-741",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<long>",
    "name" : "android::trait_trivial_copy<long>",
-   "referenced_type" : "type-704",
-   "self_type" : "type-704",
+   "referenced_type" : "type-697",
+   "self_type" : "type-697",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIlEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<short>",
    "name" : "android::trait_trivial_copy<short>",
-   "referenced_type" : "type-617",
-   "self_type" : "type-617",
+   "referenced_type" : "type-614",
+   "self_type" : "type-614",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-599" ],
@@ -29155,22 +29221,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned char>",
    "name" : "android::trait_trivial_copy<unsigned char>",
-   "referenced_type" : "type-540",
-   "self_type" : "type-540",
+   "referenced_type" : "type-536",
+   "self_type" : "type-536",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned int>",
    "name" : "android::trait_trivial_copy<unsigned int>",
-   "referenced_type" : "type-675",
-   "self_type" : "type-675",
+   "referenced_type" : "type-671",
+   "self_type" : "type-671",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIjEE"
   },
   {
@@ -29181,15 +29247,15 @@
    "self_type" : "type-751",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-722",
-   "self_type" : "type-722",
+   "referenced_type" : "type-720",
+   "self_type" : "type-720",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29199,8 +29265,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<unsigned short>",
    "name" : "android::trait_trivial_copy<unsigned short>",
-   "referenced_type" : "type-631",
-   "self_type" : "type-631",
+   "referenced_type" : "type-629",
+   "self_type" : "type-629",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29210,11 +29276,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_copy<void>",
    "name" : "android::trait_trivial_copy<void>",
-   "referenced_type" : "type-476",
-   "self_type" : "type-476",
+   "referenced_type" : "type-473",
+   "self_type" : "type-473",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_copyIvEE"
   },
   {
@@ -29225,7 +29291,7 @@
    "self_type" : "type-807",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29265,8 +29331,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<bool>",
    "name" : "android::trait_trivial_ctor<bool>",
-   "referenced_type" : "type-481",
-   "self_type" : "type-481",
+   "referenced_type" : "type-478",
+   "self_type" : "type-478",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29276,11 +29342,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<char>",
    "name" : "android::trait_trivial_ctor<char>",
-   "referenced_type" : "type-501",
-   "self_type" : "type-501",
+   "referenced_type" : "type-498",
+   "self_type" : "type-498",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIcEE"
   },
   {
@@ -29291,18 +29357,18 @@
    "self_type" : "type-806",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<double>",
    "name" : "android::trait_trivial_ctor<double>",
-   "referenced_type" : "type-781",
-   "self_type" : "type-781",
+   "referenced_type" : "type-775",
+   "self_type" : "type-775",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIdEE"
   },
   {
@@ -29320,11 +29386,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<int>",
    "name" : "android::trait_trivial_ctor<int>",
-   "referenced_type" : "type-638",
-   "self_type" : "type-638",
+   "referenced_type" : "type-637",
+   "self_type" : "type-637",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIiEE"
   },
   {
@@ -29335,18 +29401,18 @@
    "self_type" : "type-729",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<long>",
    "name" : "android::trait_trivial_ctor<long>",
-   "referenced_type" : "type-686",
-   "self_type" : "type-686",
+   "referenced_type" : "type-683",
+   "self_type" : "type-683",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIlEE"
   },
   {
@@ -29364,33 +29430,33 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned char>",
    "name" : "android::trait_trivial_ctor<unsigned char>",
-   "referenced_type" : "type-534",
-   "self_type" : "type-534",
+   "referenced_type" : "type-531",
+   "self_type" : "type-531",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned int>",
    "name" : "android::trait_trivial_ctor<unsigned int>",
-   "referenced_type" : "type-661",
-   "self_type" : "type-661",
+   "referenced_type" : "type-655",
+   "self_type" : "type-655",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned long long>",
    "name" : "android::trait_trivial_ctor<unsigned long long>",
-   "referenced_type" : "type-746",
-   "self_type" : "type-746",
+   "referenced_type" : "type-743",
+   "self_type" : "type-743",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIyEE"
   },
   {
@@ -29408,8 +29474,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<unsigned short>",
    "name" : "android::trait_trivial_ctor<unsigned short>",
-   "referenced_type" : "type-620",
-   "self_type" : "type-620",
+   "referenced_type" : "type-619",
+   "self_type" : "type-619",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29419,11 +29485,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_ctor<void>",
    "name" : "android::trait_trivial_ctor<void>",
-   "referenced_type" : "type-453",
-   "self_type" : "type-453",
+   "referenced_type" : "type-450",
+   "self_type" : "type-450",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_ctorIvEE"
   },
   {
@@ -29434,7 +29500,7 @@
    "self_type" : "type-809",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29474,8 +29540,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<bool>",
    "name" : "android::trait_trivial_dtor<bool>",
-   "referenced_type" : "type-482",
-   "self_type" : "type-482",
+   "referenced_type" : "type-479",
+   "self_type" : "type-479",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29485,11 +29551,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<char>",
    "name" : "android::trait_trivial_dtor<char>",
-   "referenced_type" : "type-511",
-   "self_type" : "type-511",
+   "referenced_type" : "type-508",
+   "self_type" : "type-508",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIcEE"
   },
   {
@@ -29500,7 +29566,7 @@
    "self_type" : "type-808",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIPK13native_handleEE"
   },
   {
@@ -29511,7 +29577,7 @@
    "self_type" : "type-786",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIdEE"
   },
   {
@@ -29533,18 +29599,18 @@
    "self_type" : "type-644",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "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-738",
-   "self_type" : "type-738",
+   "referenced_type" : "type-736",
+   "self_type" : "type-736",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIxEE"
   },
   {
@@ -29555,7 +29621,7 @@
    "self_type" : "type-692",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIlEE"
   },
   {
@@ -29573,41 +29639,41 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned char>",
    "name" : "android::trait_trivial_dtor<unsigned char>",
-   "referenced_type" : "type-538",
-   "self_type" : "type-538",
+   "referenced_type" : "type-535",
+   "self_type" : "type-535",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned int>",
    "name" : "android::trait_trivial_dtor<unsigned int>",
-   "referenced_type" : "type-668",
-   "self_type" : "type-668",
+   "referenced_type" : "type-664",
+   "self_type" : "type-664",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIjEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned long long>",
    "name" : "android::trait_trivial_dtor<unsigned long long>",
-   "referenced_type" : "type-749",
-   "self_type" : "type-749",
+   "referenced_type" : "type-747",
+   "self_type" : "type-747",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-719",
-   "self_type" : "type-719",
+   "referenced_type" : "type-715",
+   "self_type" : "type-715",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29617,8 +29683,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<unsigned short>",
    "name" : "android::trait_trivial_dtor<unsigned short>",
-   "referenced_type" : "type-625",
-   "self_type" : "type-625",
+   "referenced_type" : "type-621",
+   "self_type" : "type-621",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-3" ],
@@ -29628,22 +29694,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_dtor<void>",
    "name" : "android::trait_trivial_dtor<void>",
-   "referenced_type" : "type-469",
-   "self_type" : "type-469",
+   "referenced_type" : "type-462",
+   "self_type" : "type-462",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_dtorIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::trait_trivial_move<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-815",
-   "self_type" : "type-815",
+   "referenced_type" : "type-816",
+   "self_type" : "type-816",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
@@ -29672,11 +29738,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::String16>",
    "name" : "android::trait_trivial_move<android::String16>",
-   "referenced_type" : "type-191",
-   "self_type" : "type-191",
+   "referenced_type" : "type-204",
+   "self_type" : "type-204",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String16.h",
-   "template_args" : [ "type-179" ],
+   "template_args" : [ "type-182" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_8String16EEE"
   },
   {
@@ -29687,15 +29753,15 @@
    "self_type" : "type-902",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/String8.h",
-   "template_args" : [ "type-285" ],
+   "template_args" : [ "type-282" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveINS_7String8EEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::trait_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-816",
-   "self_type" : "type-816",
+   "referenced_type" : "type-817",
+   "self_type" : "type-817",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29705,8 +29771,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<bool>",
    "name" : "android::trait_trivial_move<bool>",
-   "referenced_type" : "type-490",
-   "self_type" : "type-490",
+   "referenced_type" : "type-485",
+   "self_type" : "type-485",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-6" ],
@@ -29716,22 +29782,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<char>",
    "name" : "android::trait_trivial_move<char>",
-   "referenced_type" : "type-533",
-   "self_type" : "type-533",
+   "referenced_type" : "type-513",
+   "self_type" : "type-513",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-288" ],
+   "template_args" : [ "type-285" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIcEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<const native_handle *>",
    "name" : "android::trait_trivial_move<const native_handle *>",
-   "referenced_type" : "type-814",
-   "self_type" : "type-814",
+   "referenced_type" : "type-815",
+   "self_type" : "type-815",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIPK13native_handleEE"
   },
   {
@@ -29742,7 +29808,7 @@
    "self_type" : "type-798",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-41" ],
+   "template_args" : [ "type-43" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIdEE"
   },
   {
@@ -29760,11 +29826,11 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<int>",
    "name" : "android::trait_trivial_move<int>",
-   "referenced_type" : "type-650",
-   "self_type" : "type-650",
+   "referenced_type" : "type-648",
+   "self_type" : "type-648",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-103" ],
+   "template_args" : [ "type-105" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIiEE"
   },
   {
@@ -29775,18 +29841,18 @@
    "self_type" : "type-742",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIxEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<long>",
    "name" : "android::trait_trivial_move<long>",
-   "referenced_type" : "type-708",
-   "self_type" : "type-708",
+   "referenced_type" : "type-707",
+   "self_type" : "type-707",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-687" ],
+   "template_args" : [ "type-684" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIlEE"
   },
   {
@@ -29804,22 +29870,22 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned char>",
    "name" : "android::trait_trivial_move<unsigned char>",
-   "referenced_type" : "type-577",
-   "self_type" : "type-577",
+   "referenced_type" : "type-574",
+   "self_type" : "type-574",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-218" ],
+   "template_args" : [ "type-220" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIhEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<unsigned int>",
    "name" : "android::trait_trivial_move<unsigned int>",
-   "referenced_type" : "type-682",
-   "self_type" : "type-682",
+   "referenced_type" : "type-677",
+   "self_type" : "type-677",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-123" ],
+   "template_args" : [ "type-125" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIjEE"
   },
   {
@@ -29830,15 +29896,15 @@
    "self_type" : "type-752",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-124" ],
+   "template_args" : [ "type-126" ],
    "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-728",
-   "self_type" : "type-728",
+   "referenced_type" : "type-725",
+   "self_type" : "type-725",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-710" ],
@@ -29859,30 +29925,30 @@
    "alignment" : 1,
    "linker_set_key" : "android::trait_trivial_move<void>",
    "name" : "android::trait_trivial_move<void>",
-   "referenced_type" : "type-480",
-   "self_type" : "type-480",
+   "referenced_type" : "type-477",
+   "self_type" : "type-477",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-151" ],
+   "template_args" : [ "type-154" ],
    "unique_id" : "_ZTSN7android18trait_trivial_moveIvEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
    "name" : "android::traits<android::GraphicBufferAllocator::alloc_rec_t>",
-   "referenced_type" : "type-823",
-   "self_type" : "type-823",
+   "referenced_type" : "type-824",
+   "self_type" : "type-824",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-676" ],
+   "template_args" : [ "type-680" ],
    "unique_id" : "_ZTSN7android6traitsINS_22GraphicBufferAllocator11alloc_rec_tEEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::Rect>",
    "name" : "android::traits<android::Rect>",
-   "referenced_type" : "type-2401",
-   "self_type" : "type-2401",
+   "referenced_type" : "type-2403",
+   "self_type" : "type-2403",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -29892,8 +29958,8 @@
    "alignment" : 1,
    "linker_set_key" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::traits<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-820",
-   "self_type" : "type-820",
+   "referenced_type" : "type-821",
+   "self_type" : "type-821",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -29907,18 +29973,18 @@
    "self_type" : "type-822",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-142" ],
+   "template_args" : [ "type-145" ],
    "unique_id" : "_ZTSN7android6traitsIPK13native_handleEE"
   },
   {
    "alignment" : 1,
    "linker_set_key" : "android::traits<long long>",
    "name" : "android::traits<long long>",
-   "referenced_type" : "type-1431",
-   "self_type" : "type-1431",
+   "referenced_type" : "type-1435",
+   "self_type" : "type-1435",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android6traitsIxEE"
   },
   {
@@ -29927,12 +29993,12 @@
    [
     {
      "field_name" : "width",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "height",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android::ui::Size",
@@ -29950,20 +30016,20 @@
     {
      "access" : "private",
      "field_name" : "mMatrix",
-     "referenced_type" : "type-2435"
+     "referenced_type" : "type-2437"
     },
     {
      "access" : "private",
      "field_name" : "mType",
      "field_offset" : 288,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "android::ui::Transform",
    "name" : "android::ui::Transform",
    "record_kind" : "class",
-   "referenced_type" : "type-2434",
-   "self_type" : "type-2434",
+   "referenced_type" : "type-2436",
+   "self_type" : "type-2436",
    "size" : 40,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9TransformE"
@@ -29980,8 +30046,8 @@
    ],
    "linker_set_key" : "android::ui::Transform::mat33",
    "name" : "android::ui::Transform::mat33",
-   "referenced_type" : "type-2435",
-   "self_type" : "type-2435",
+   "referenced_type" : "type-2437",
+   "self_type" : "type-2437",
    "size" : 36,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Transform.h",
    "unique_id" : "_ZTSN7android2ui9Transform5mat33E"
@@ -29991,13 +30057,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-2381"
+     "referenced_type" : "type-2383"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::Rect>",
    "name" : "android::use_trivial_move<android::Rect>",
-   "referenced_type" : "type-2380",
-   "self_type" : "type-2380",
+   "referenced_type" : "type-2382",
+   "self_type" : "type-2382",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-1241" ],
@@ -30008,13 +30074,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-701"
+     "referenced_type" : "type-704"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
    "name" : "android::use_trivial_move<android::key_value_pair_t<const native_handle *, android::GraphicBufferAllocator::alloc_rec_t> >",
-   "referenced_type" : "type-700",
-   "self_type" : "type-700",
+   "referenced_type" : "type-703",
+   "self_type" : "type-703",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
    "template_args" : [ "type-694" ],
@@ -30025,16 +30091,16 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-1417"
+     "referenced_type" : "type-1422"
     }
    ],
    "linker_set_key" : "android::use_trivial_move<long long>",
    "name" : "android::use_trivial_move<long long>",
-   "referenced_type" : "type-1416",
-   "self_type" : "type-1416",
+   "referenced_type" : "type-1421",
+   "self_type" : "type-1421",
    "size" : 1,
    "source_file" : "/system/core/libutils/include/utils/TypeHelpers.h",
-   "template_args" : [ "type-284" ],
+   "template_args" : [ "type-12" ],
    "unique_id" : "_ZTSN7android16use_trivial_moveIxEE"
   },
   {
@@ -30065,12 +30131,12 @@
    [
     {
      "field_name" : "num_points",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 32,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     },
     {
      "field_name" : "xyzc_points",
@@ -30097,7 +30163,7 @@
     {
      "field_name" : "num_planes",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "planes",
@@ -30119,7 +30185,7 @@
    [
     {
      "field_name" : "top_left",
-     "referenced_type" : "type-217"
+     "referenced_type" : "type-219"
     },
     {
      "field_name" : "component",
@@ -30129,32 +30195,32 @@
     {
      "field_name" : "bits_per_component",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bits_used",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_increment",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_increment",
      "field_offset" : 160,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "h_subsampling",
      "field_offset" : 192,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "v_subsampling",
      "field_offset" : 224,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_flex_plane",
@@ -30171,33 +30237,33 @@
    [
     {
      "field_name" : "magic",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 64,
-     "referenced_type" : "type-519"
+     "referenced_type" : "type-517"
     },
     {
      "field_name" : "incRef",
      "field_offset" : 192,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     },
     {
      "field_name" : "decRef",
      "field_offset" : 224,
-     "referenced_type" : "type-520"
+     "referenced_type" : "type-518"
     }
    ],
    "linker_set_key" : "android_native_base_t",
    "name" : "android_native_base_t",
-   "referenced_type" : "type-518",
-   "self_type" : "type-518",
+   "referenced_type" : "type-516",
+   "self_type" : "type-516",
    "size" : 32,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_base_t"
@@ -30208,28 +30274,28 @@
    [
     {
      "field_name" : "left",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "top",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "right",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "bottom",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     }
    ],
    "linker_set_key" : "android_native_rect_t",
    "name" : "android_native_rect_t",
-   "referenced_type" : "type-619",
-   "self_type" : "type-619",
+   "referenced_type" : "type-620",
+   "self_type" : "type-620",
    "size" : 16,
    "source_file" : "/frameworks/native/libs/nativebase/include/nativebase/nativebase.h",
    "unique_id" : "android_native_rect_t"
@@ -30304,43 +30370,43 @@
    [
     {
      "field_name" : "y",
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cb",
      "field_offset" : 32,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "cr",
      "field_offset" : 64,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "ystride",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "cstride",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "chroma_step",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 192,
-     "referenced_type" : "type-349"
+     "referenced_type" : "type-346"
     }
    ],
    "linker_set_key" : "android_ycbcr",
    "name" : "android_ycbcr",
-   "referenced_type" : "type-348",
-   "self_type" : "type-348",
+   "referenced_type" : "type-345",
+   "self_type" : "type-345",
    "size" : 56,
    "source_file" : "/system/core/libsystem/include/system/graphics.h",
    "unique_id" : "android_ycbcr"
@@ -30351,108 +30417,108 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-547"
+     "referenced_type" : "type-544"
     },
     {
      "field_name" : "flags",
      "field_offset" : 512,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "width",
      "field_offset" : 544,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "height",
      "field_offset" : 576,
-     "referenced_type" : "type-236"
+     "referenced_type" : "type-238"
     },
     {
      "field_name" : "stride",
      "field_offset" : 608,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "format",
      "field_offset" : 640,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "xdpi",
      "field_offset" : 672,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "ydpi",
      "field_offset" : 704,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "fps",
      "field_offset" : 736,
-     "referenced_type" : "type-563"
+     "referenced_type" : "type-560"
     },
     {
      "field_name" : "minSwapInterval",
      "field_offset" : 768,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "maxSwapInterval",
      "field_offset" : 800,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "numFramebuffers",
      "field_offset" : 832,
-     "referenced_type" : "type-562"
+     "referenced_type" : "type-559"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 864,
-     "referenced_type" : "type-564"
+     "referenced_type" : "type-561"
     },
     {
      "field_name" : "setSwapInterval",
      "field_offset" : 1088,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "setUpdateRect",
      "field_offset" : 1120,
-     "referenced_type" : "type-568"
+     "referenced_type" : "type-565"
     },
     {
      "field_name" : "post",
      "field_offset" : 1152,
-     "referenced_type" : "type-570"
+     "referenced_type" : "type-567"
     },
     {
      "field_name" : "compositionComplete",
      "field_offset" : 1184,
-     "referenced_type" : "type-572"
+     "referenced_type" : "type-569"
     },
     {
      "field_name" : "dump",
      "field_offset" : 1216,
-     "referenced_type" : "type-574"
+     "referenced_type" : "type-571"
     },
     {
      "field_name" : "enableScreen",
      "field_offset" : 1248,
-     "referenced_type" : "type-565"
+     "referenced_type" : "type-562"
     },
     {
      "field_name" : "reserved_proc",
      "field_offset" : 1280,
-     "referenced_type" : "type-524"
+     "referenced_type" : "type-522"
     }
    ],
    "linker_set_key" : "framebuffer_device_t",
    "name" : "framebuffer_device_t",
-   "referenced_type" : "type-546",
-   "self_type" : "type-546",
+   "referenced_type" : "type-543",
+   "self_type" : "type-543",
    "size" : 184,
    "source_file" : "/hardware/libhardware/include/hardware/fb.h",
    "unique_id" : "framebuffer_device_t"
@@ -30463,63 +30529,73 @@
    [
     {
      "field_name" : "common",
-     "referenced_type" : "type-549"
+     "referenced_type" : "type-546"
     },
     {
      "field_name" : "registerBuffer",
      "field_offset" : 1024,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "unregisterBuffer",
      "field_offset" : 1056,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "lock",
      "field_offset" : 1088,
-     "referenced_type" : "type-583"
+     "referenced_type" : "type-581"
     },
     {
      "field_name" : "unlock",
      "field_offset" : 1120,
-     "referenced_type" : "type-579"
+     "referenced_type" : "type-577"
     },
     {
      "field_name" : "perform",
      "field_offset" : 1152,
-     "referenced_type" : "type-585"
+     "referenced_type" : "type-583"
     },
     {
      "field_name" : "lock_ycbcr",
      "field_offset" : 1184,
-     "referenced_type" : "type-587"
+     "referenced_type" : "type-585"
     },
     {
      "field_name" : "lockAsync",
      "field_offset" : 1216,
-     "referenced_type" : "type-589"
+     "referenced_type" : "type-587"
     },
     {
      "field_name" : "unlockAsync",
      "field_offset" : 1248,
-     "referenced_type" : "type-591"
+     "referenced_type" : "type-589"
     },
     {
      "field_name" : "lockAsync_ycbcr",
      "field_offset" : 1280,
+     "referenced_type" : "type-592"
+    },
+    {
+     "field_name" : "getTransportSize",
+     "field_offset" : 1312,
      "referenced_type" : "type-594"
     },
     {
-     "field_name" : "reserved_proc",
-     "field_offset" : 1312,
+     "field_name" : "validateBufferSize",
+     "field_offset" : 1344,
      "referenced_type" : "type-596"
+    },
+    {
+     "field_name" : "reserved_proc",
+     "field_offset" : 1376,
+     "referenced_type" : "type-521"
     }
    ],
    "linker_set_key" : "gralloc_module_t",
    "name" : "gralloc_module_t",
-   "referenced_type" : "type-578",
-   "self_type" : "type-578",
+   "referenced_type" : "type-576",
+   "self_type" : "type-576",
    "size" : 176,
    "source_file" : "/hardware/libhardware/include/hardware/gralloc.h",
    "unique_id" : "gralloc_module_t"
@@ -30530,33 +30606,33 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "version",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module",
      "field_offset" : 64,
-     "referenced_type" : "type-548"
+     "referenced_type" : "type-545"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 96,
-     "referenced_type" : "type-559"
+     "referenced_type" : "type-556"
     },
     {
      "field_name" : "close",
      "field_offset" : 480,
-     "referenced_type" : "type-560"
+     "referenced_type" : "type-557"
     }
    ],
    "linker_set_key" : "hw_device_t",
    "name" : "hw_device_t",
-   "referenced_type" : "type-547",
-   "self_type" : "type-547",
+   "referenced_type" : "type-544",
+   "self_type" : "type-544",
    "size" : 64,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_device_t"
@@ -30567,13 +30643,13 @@
    [
     {
      "field_name" : "open",
-     "referenced_type" : "type-552"
+     "referenced_type" : "type-549"
     }
    ],
    "linker_set_key" : "hw_module_methods_t",
    "name" : "hw_module_methods_t",
-   "referenced_type" : "type-551",
-   "self_type" : "type-551",
+   "referenced_type" : "type-548",
+   "self_type" : "type-548",
    "size" : 4,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_methods_t"
@@ -30584,7 +30660,7 @@
    [
     {
      "field_name" : "tag",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "module_api_version",
@@ -30599,38 +30675,38 @@
     {
      "field_name" : "id",
      "field_offset" : 64,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "name",
      "field_offset" : 96,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "author",
      "field_offset" : 128,
-     "referenced_type" : "type-286"
+     "referenced_type" : "type-283"
     },
     {
      "field_name" : "methods",
      "field_offset" : 160,
-     "referenced_type" : "type-550"
+     "referenced_type" : "type-547"
     },
     {
      "field_name" : "dso",
      "field_offset" : 192,
-     "referenced_type" : "type-227"
+     "referenced_type" : "type-229"
     },
     {
      "field_name" : "reserved",
      "field_offset" : 224,
-     "referenced_type" : "type-558"
+     "referenced_type" : "type-555"
     }
    ],
    "linker_set_key" : "hw_module_t",
    "name" : "hw_module_t",
-   "referenced_type" : "type-549",
-   "self_type" : "type-549",
+   "referenced_type" : "type-546",
+   "self_type" : "type-546",
    "size" : 128,
    "source_file" : "/hardware/libhardware/include/hardware/hardware.h",
    "unique_id" : "hw_module_t"
@@ -30696,12 +30772,12 @@
    [
     {
      "field_name" : "tv_sec",
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "tv_nsec",
      "field_offset" : 32,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     }
    ],
    "linker_set_key" : "log_time",
@@ -30728,22 +30804,22 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "msg",
@@ -30775,27 +30851,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "euid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30827,27 +30903,27 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30879,32 +30955,32 @@
     {
      "field_name" : "pid",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "tid",
      "field_offset" : 64,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "sec",
      "field_offset" : 96,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "nsec",
      "field_offset" : 128,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "lid",
      "field_offset" : 160,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "uid",
      "field_offset" : 192,
-     "referenced_type" : "type-123"
+     "referenced_type" : "type-125"
     },
     {
      "field_name" : "msg",
@@ -30926,28 +31002,28 @@
    [
     {
      "field_name" : "version",
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numFds",
      "field_offset" : 32,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "numInts",
      "field_offset" : 64,
-     "referenced_type" : "type-103"
+     "referenced_type" : "type-105"
     },
     {
      "field_name" : "data",
      "field_offset" : 96,
-     "referenced_type" : "type-145"
+     "referenced_type" : "type-148"
     }
    ],
    "linker_set_key" : "native_handle",
    "name" : "native_handle",
-   "referenced_type" : "type-144",
-   "self_type" : "type-144",
+   "referenced_type" : "type-147",
+   "self_type" : "type-147",
    "size" : 12,
    "source_file" : "/system/core/libcutils/include/cutils/native_handle.h",
    "unique_id" : "native_handle"
@@ -30957,13 +31033,13 @@
    "base_specifiers" :
    [
     {
-     "referenced_type" : "type-435"
+     "referenced_type" : "type-432"
     }
    ],
    "linker_set_key" : "std::is_floating_point<android::half>",
    "name" : "std::is_floating_point<android::half>",
-   "referenced_type" : "type-434",
-   "self_type" : "type-434",
+   "referenced_type" : "type-431",
+   "self_type" : "type-431",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30974,8 +31050,8 @@
    "linker_set_key" : "std::numeric_limits<android::half>",
    "name" : "std::numeric_limits<android::half>",
    "record_kind" : "class",
-   "referenced_type" : "type-597",
-   "self_type" : "type-597",
+   "referenced_type" : "type-575",
+   "self_type" : "type-575",
    "size" : 1,
    "source_file" : "/frameworks/native/libs/math/include/math/half.h",
    "template_args" : [ "type-1" ],
@@ -30988,8 +31064,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::FenceTime::Snapshot &&",
    "name" : "android::FenceTime::Snapshot &&",
-   "referenced_type" : "type-1383",
-   "self_type" : "type-1386",
+   "referenced_type" : "type-1387",
+   "self_type" : "type-1391",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/FenceTime.h"
   },
@@ -31015,8 +31091,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V2_0::Error> &&",
-   "referenced_type" : "type-99",
-   "self_type" : "type-107",
+   "referenced_type" : "type-101",
+   "self_type" : "type-109",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31024,8 +31100,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
    "name" : "android::hardware::Return<android::hardware::graphics::mapper::V3_0::Error> &&",
-   "referenced_type" : "type-393",
-   "self_type" : "type-399",
+   "referenced_type" : "type-392",
+   "self_type" : "type-396",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31033,8 +31109,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
    "name" : "android::hardware::Return<android::sp<android::hardware::graphics::mapper::V2_1::IMapper> > &&",
-   "referenced_type" : "type-111",
-   "self_type" : "type-113",
+   "referenced_type" : "type-113",
+   "self_type" : "type-115",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
   },
@@ -31051,7 +31127,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::Status &&",
    "name" : "android::hardware::Status &&",
-   "referenced_type" : "type-102",
+   "referenced_type" : "type-104",
    "self_type" : "type-1312",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31060,7 +31136,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::details::return_status &&",
    "name" : "android::hardware::details::return_status &&",
-   "referenced_type" : "type-101",
+   "referenced_type" : "type-103",
    "self_type" : "type-1318",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/Status.h"
@@ -31069,7 +31145,7 @@
    "alignment" : 4,
    "linker_set_key" : "android::hardware::hidl_handle &&",
    "name" : "android::hardware::hidl_handle &&",
-   "referenced_type" : "type-139",
+   "referenced_type" : "type-142",
    "self_type" : "type-1087",
    "size" : 4,
    "source_file" : "/system/libhidl/base/include/hidl/HidlSupport.h"
@@ -31088,7 +31164,7 @@
    "linker_set_key" : "android::sp<android::Fence> &&",
    "name" : "android::sp<android::Fence> &&",
    "referenced_type" : "type-1357",
-   "self_type" : "type-1410",
+   "self_type" : "type-1415",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31096,8 +31172,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V2_0::IAllocator> &&",
-   "referenced_type" : "type-355",
-   "self_type" : "type-378",
+   "referenced_type" : "type-352",
+   "self_type" : "type-375",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31105,8 +31181,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
    "name" : "android::sp<android::hardware::graphics::allocator::V3_0::IAllocator> &&",
-   "referenced_type" : "type-484",
-   "self_type" : "type-491",
+   "referenced_type" : "type-481",
+   "self_type" : "type-488",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31114,8 +31190,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_0::IMapper> &&",
-   "referenced_type" : "type-338",
-   "self_type" : "type-386",
+   "referenced_type" : "type-335",
+   "self_type" : "type-383",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31123,8 +31199,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V2_1::IMapper> &&",
-   "referenced_type" : "type-86",
-   "self_type" : "type-94",
+   "referenced_type" : "type-88",
+   "self_type" : "type-96",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31132,8 +31208,8 @@
    "alignment" : 4,
    "linker_set_key" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
    "name" : "android::sp<android::hardware::graphics::mapper::V3_0::IMapper> &&",
-   "referenced_type" : "type-497",
-   "self_type" : "type-504",
+   "referenced_type" : "type-494",
+   "self_type" : "type-501",
    "size" : 4,
    "source_file" : "/system/core/libutils/include/utils/StrongPointer.h"
   },
@@ -31141,7 +31217,7 @@
    "alignment" : 4,
    "linker_set_key" : "int &&",
    "name" : "int &&",
-   "referenced_type" : "type-103",
+   "referenced_type" : "type-105",
    "self_type" : "type-1294",
    "size" : 4,
    "source_file" : "/frameworks/native/libs/ui/include/ui/Size.h"