Updating ABI for GraphicBufferAllocator overflow fix

Bug: 142767215
Test: build, boot, GraphicBufferAllocator_test
Change-Id: I5cc0ef3b9a6173ed2e08d67483ceb762ddb06a0a
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"